From a7b01e4a6aaba8136b0974f3ee726a36bb446451 Mon Sep 17 00:00:00 2001 From: Pierre Paridans Date: Fri, 4 Aug 2023 11:44:22 +0000 Subject: [PATCH] [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 --- addons/web/__manifest__.py | 4 ---- addons/website/__manifest__.py | 2 ++ addons/website/static/src/js/content/website_root.js | 2 +- .../js/libs => website/static/src/libs/zoomodoo}/zoomodoo.js | 0 .../static/src/libs/zoomodoo/zoomodoo.scss} | 0 addons/website_sale/static/src/js/website_sale.js | 2 +- addons/website_slides/__manifest__.py | 4 ++-- debian/copyright | 2 +- 8 files changed, 7 insertions(+), 9 deletions(-) rename addons/{web/static/src/legacy/js/libs => website/static/src/libs/zoomodoo}/zoomodoo.js (100%) rename addons/{web/static/src/legacy/scss/web.zoomodoo.scss => website/static/src/libs/zoomodoo/zoomodoo.scss} (100%) diff --git a/addons/web/__manifest__.py b/addons/web/__manifest__.py index 515aa2527ee..ee9f765f7f4 100644 --- a/addons/web/__manifest__.py +++ b/addons/web/__manifest__.py @@ -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', diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py index b0a32123526..eafe252c127 100644 --- a/addons/website/__manifest__.py +++ b/addons/website/__manifest__.py @@ -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', diff --git a/addons/website/static/src/js/content/website_root.js b/addons/website/static/src/js/content/website_root.js index 7ca1cb03573..470c97d8484 100644 --- a/addons/website/static/src/js/content/website_root.js +++ b/addons/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({ diff --git a/addons/web/static/src/legacy/js/libs/zoomodoo.js b/addons/website/static/src/libs/zoomodoo/zoomodoo.js similarity index 100% rename from addons/web/static/src/legacy/js/libs/zoomodoo.js rename to addons/website/static/src/libs/zoomodoo/zoomodoo.js diff --git a/addons/web/static/src/legacy/scss/web.zoomodoo.scss b/addons/website/static/src/libs/zoomodoo/zoomodoo.scss similarity index 100% rename from addons/web/static/src/legacy/scss/web.zoomodoo.scss rename to addons/website/static/src/libs/zoomodoo/zoomodoo.scss diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js index b8fd7fb9667..780c19a4656 100644 --- a/addons/website_sale/static/src/js/website_sale.js +++ b/addons/website_sale/static/src/js/website_sale.js @@ -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"; diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py index 0a737657b31..e7321c2a475 100644 --- a/addons/website_slides/__manifest__.py +++ b/addons/website_slides/__manifest__.py @@ -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', diff --git a/debian/copyright b/debian/copyright index 30decec4bd6..5d18d627990 100644 --- a/debian/copyright +++ b/debian/copyright @@ -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