From b535de4344c4fbb5de18664c51d3d0a0b7df684c Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Fri, 21 Apr 2023 15:34:21 +0200 Subject: [PATCH] [FIX] web_editor: remove ace editor files from the frontend bundle The JS + XML and related lib JS files are only used by the website editor and by studio. So it should only part of the backend bundle. Recently these assets were put there by [1] as a first step towards a potential deletion of the assets_common bundle, which was later removed by [2], they should however never been in common. [1]: https://github.com/odoo/odoo/commit/08dcbc8f1def06476d025b110049ee596e906816 [2]: https://github.com/odoo/odoo/commit/6f95be6884a59665ca7d8a809e7aaa17695fa9b0 task-3229205 Part-of: odoo/odoo#117051 --- addons/web_editor/__manifest__.py | 2 -- addons/web_editor/static/src/js/{common => backend}/ace.js | 0 addons/website/static/src/components/ace_editor/ace_editor.js | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) rename addons/web_editor/static/src/js/{common => backend}/ace.js (100%) diff --git a/addons/web_editor/__manifest__.py b/addons/web_editor/__manifest__.py index c8230c63470..61720b42bb1 100644 --- a/addons/web_editor/__manifest__.py +++ b/addons/web_editor/__manifest__.py @@ -203,11 +203,9 @@ Odoo Web Editor widget. ('include', 'web_editor.assets_media_dialog'), 'web_editor/static/src/js/editor/odoo-editor/src/base_style.scss', - 'web_editor/static/lib/vkbeautify/**/*', 'web_editor/static/src/js/common/**/*', 'web_editor/static/src/js/editor/odoo-editor/src/utils/utils.js', 'web_editor/static/src/js/wysiwyg/fonts.js', - 'web_editor/static/src/xml/ace.xml', 'web_editor/static/src/scss/web_editor.common.scss', 'web_editor/static/src/scss/web_editor.frontend.scss', diff --git a/addons/web_editor/static/src/js/common/ace.js b/addons/web_editor/static/src/js/backend/ace.js similarity index 100% rename from addons/web_editor/static/src/js/common/ace.js rename to addons/web_editor/static/src/js/backend/ace.js diff --git a/addons/website/static/src/components/ace_editor/ace_editor.js b/addons/website/static/src/components/ace_editor/ace_editor.js index b698ffe9314..10d6a97f565 100644 --- a/addons/website/static/src/components/ace_editor/ace_editor.js +++ b/addons/website/static/src/components/ace_editor/ace_editor.js @@ -2,7 +2,7 @@ import { useWidget } from "@web/legacy/utils"; import {useService} from '@web/core/utils/hooks'; -import AceEditor from '@web_editor/js/common/ace'; +import AceEditor from '@web_editor/js/backend/ace'; import { Component, xml } from "@odoo/owl";