Skip to content

Commit

Permalink
[IMP] web,website,website_*: moves zoomodoo lib out of web module
Browse files Browse the repository at this point in the history
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#130875
  • Loading branch information
pparidans committed Aug 22, 2023
1 parent 47c5a09 commit a7b01e4
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 9 deletions.
4 changes: 0 additions & 4 deletions addons/web/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
'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',
Expand Down Expand Up @@ -116,7 +115,6 @@
'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',
Expand Down Expand Up @@ -255,7 +253,6 @@
'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',

Expand Down Expand Up @@ -303,7 +300,6 @@
'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',
Expand Down
2 changes: 2 additions & 0 deletions addons/website/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion addons/website/static/src/js/content/website_root.js
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion addons/website_sale/static/src/js/website_sale.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions addons/website_slides/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
'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',
Expand Down Expand Up @@ -197,7 +197,7 @@
'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',
Expand Down
2 changes: 1 addition & 1 deletion debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit a7b01e4

Please sign in to comment.