[IMP] web,website,website_*: moves zoomodoo lib out of web module
This commit moves the ZoomOdoo library out of the web module and the backend bundle (through the common bundle) to the website module (as it's used by it and its dependent modules). Part-of: odoo/odoo#130875
This commit is contained in:
@@ -67,7 +67,6 @@ This module provides the core of the Odoo Web Client.
|
||||
'web/static/src/legacy/scss/translation_dialog.scss',
|
||||
'web/static/src/legacy/scss/keyboard.scss',
|
||||
'web/static/src/legacy/scss/name_and_signature.scss',
|
||||
'web/static/src/legacy/scss/web.zoomodoo.scss',
|
||||
|
||||
'web/static/src/legacy/js/promise_extension.js',
|
||||
'web/static/src/boot.js',
|
||||
@@ -116,7 +115,6 @@ This module provides the core of the Odoo Web Client.
|
||||
'web/static/src/legacy/js/libs/jquery.js',
|
||||
'web/static/src/legacy/js/libs/moment.js',
|
||||
'web/static/src/legacy/js/libs/pdfjs.js',
|
||||
'web/static/src/legacy/js/libs/zoomodoo.js',
|
||||
'web/static/src/legacy/js/libs/jSignatureCustom.js',
|
||||
'web/static/src/legacy/js/core/ajax.js',
|
||||
'web/static/src/legacy/js/core/bus.js',
|
||||
@@ -255,7 +253,6 @@ This module provides the core of the Odoo Web Client.
|
||||
'web/static/src/legacy/scss/translation_dialog.scss',
|
||||
'web/static/src/legacy/scss/keyboard.scss',
|
||||
'web/static/src/legacy/scss/name_and_signature.scss',
|
||||
'web/static/src/legacy/scss/web.zoomodoo.scss',
|
||||
|
||||
'web/static/src/legacy/scss/lazyloader.scss',
|
||||
|
||||
@@ -303,7 +300,6 @@ This module provides the core of the Odoo Web Client.
|
||||
'web/static/src/legacy/js/libs/jquery.js',
|
||||
'web/static/src/legacy/js/libs/moment.js',
|
||||
'web/static/src/legacy/js/libs/pdfjs.js',
|
||||
'web/static/src/legacy/js/libs/zoomodoo.js',
|
||||
'web/static/src/legacy/js/libs/jSignatureCustom.js',
|
||||
'web/static/src/legacy/js/core/ajax.js',
|
||||
'web/static/src/legacy/js/core/bus.js',
|
||||
|
||||
@@ -118,8 +118,10 @@
|
||||
'assets': {
|
||||
'web.assets_frontend': [
|
||||
('replace', 'web/static/src/legacy/js/public/public_root_instance.js', 'website/static/src/js/content/website_root_instance.js'),
|
||||
'website/static/src/libs/zoomodoo/zoomodoo.scss',
|
||||
'website/static/src/scss/website.scss',
|
||||
'website/static/src/scss/website.ui.scss',
|
||||
'website/static/src/libs/zoomodoo/zoomodoo.js',
|
||||
'website/static/src/js/utils.js',
|
||||
'website/static/src/js/tours/tour_utils.js',
|
||||
'website/static/src/js/content/website_root.js',
|
||||
|
||||
@@ -5,7 +5,7 @@ import { _t } from "@web/core/l10n/translation";
|
||||
import { Markup } from '@web/legacy/js/core/utils';
|
||||
import session from 'web.session';
|
||||
import publicRootData from '@web/legacy/js/public/public_root';
|
||||
import "@web/legacy/js/libs/zoomodoo";
|
||||
import "@website/libs/zoomodoo/zoomodoo";
|
||||
import { pick } from "@web/core/utils/objects";
|
||||
|
||||
export const WebsiteRoot = publicRootData.PublicRoot.extend({
|
||||
|
||||
@@ -6,7 +6,7 @@ import publicWidget from "@web/legacy/js/public/public_widget";
|
||||
import VariantMixin from "@website_sale/js/variant_mixin";
|
||||
import wSaleUtils from "@website_sale/js/website_sale_utils";
|
||||
const cartHandlerMixin = wSaleUtils.cartHandlerMixin;
|
||||
import "@web/legacy/js/libs/zoomodoo";
|
||||
import "@website/libs/zoomodoo/zoomodoo";
|
||||
import {extraMenuUpdateCallbacks} from "@website/js/content/menu";
|
||||
import dom from "@web/legacy/js/core/dom";
|
||||
import { ComponentWrapper } from "@web/legacy/js/owl_compatibility";
|
||||
|
||||
@@ -147,7 +147,7 @@ Featuring
|
||||
'web/static/src/legacy/scss/translation_dialog.scss',
|
||||
'web/static/src/legacy/scss/keyboard.scss',
|
||||
'web/static/src/legacy/scss/name_and_signature.scss',
|
||||
'web/static/src/legacy/scss/web.zoomodoo.scss',
|
||||
'website/static/src/libs/zoomodoo/zoomodoo.scss',
|
||||
|
||||
'web/static/src/legacy/js/promise_extension.js',
|
||||
'web/static/src/boot.js',
|
||||
@@ -197,7 +197,7 @@ Featuring
|
||||
'web/static/src/legacy/js/libs/jquery.js',
|
||||
'web/static/src/legacy/js/libs/moment.js',
|
||||
'web/static/src/legacy/js/libs/pdfjs.js',
|
||||
'web/static/src/legacy/js/libs/zoomodoo.js',
|
||||
'website/static/src/libs/zoomodoo/zoomodoo.js',
|
||||
'web/static/src/legacy/js/libs/jSignatureCustom.js',
|
||||
'web/static/src/legacy/js/core/ajax.js',
|
||||
'web/static/src/legacy/js/core/bus.js',
|
||||
|
||||
Vendored
+1
-1
@@ -378,7 +378,7 @@ Files: addons/web/static/src/js/libs/download.js
|
||||
Copyright: 2016 dandavis
|
||||
License: MIT
|
||||
|
||||
Files: addons/web/static/src/js/libs/zoomodoo.js
|
||||
Files: addons/website/static/src/libs/zoomodoo/zoomodoo.js
|
||||
Copyright: 2013 Matt Hinchliffe
|
||||
License: MIT
|
||||
|
||||
|
||||
Reference in New Issue
Block a user