From 86d26ffb88720ba06261d03c683777d1673e9700 Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Mon, 21 Jan 2019 13:22:46 +0000 Subject: [PATCH] [FIX] website, *: restore using widgets outside the editor * web_editor Following the new editor's merge at https://github.com/odoo/odoo/pull/29775, the editor dialog and the switches crashed on their use in website. This is because the merge split some xml files without adapting xml dependencies... this commit only takes care of code which depended on '/web_editor/static/src/xml/editor.xml'. closes odoo/odoo#30408 --- addons/web_editor/static/src/js/wysiwyg/widgets/alt_dialog.js | 2 +- addons/web_editor/static/src/js/wysiwyg/widgets/crop_dialog.js | 2 +- addons/web_editor/static/src/js/wysiwyg/widgets/media.js | 2 +- addons/web_editor/static/src/js/wysiwyg/widgets/media_dialog.js | 2 +- addons/website/static/src/js/menu/customize.js | 2 +- addons/website/static/src/js/menu/new_content.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/web_editor/static/src/js/wysiwyg/widgets/alt_dialog.js b/addons/web_editor/static/src/js/wysiwyg/widgets/alt_dialog.js index 63d90fc3f52..dd6baff130f 100644 --- a/addons/web_editor/static/src/js/wysiwyg/widgets/alt_dialog.js +++ b/addons/web_editor/static/src/js/wysiwyg/widgets/alt_dialog.js @@ -12,7 +12,7 @@ var _t = core._t; var AltDialog = Dialog.extend({ template: 'wysiwyg.widgets.alt', xmlDependencies: Dialog.prototype.xmlDependencies.concat( - ['/web_editor/static/src/xml/editor.xml'] + ['/web_editor/static/src/xml/wysiwyg.xml'] ), /** diff --git a/addons/web_editor/static/src/js/wysiwyg/widgets/crop_dialog.js b/addons/web_editor/static/src/js/wysiwyg/widgets/crop_dialog.js index 77bcd5578b3..5996fabc254 100644 --- a/addons/web_editor/static/src/js/wysiwyg/widgets/crop_dialog.js +++ b/addons/web_editor/static/src/js/wysiwyg/widgets/crop_dialog.js @@ -12,7 +12,7 @@ var _t = core._t; var CropImageDialog = Dialog.extend({ template: 'wysiwyg.widgets.crop_image', xmlDependencies: Dialog.prototype.xmlDependencies.concat( - ['/web_editor/static/src/xml/editor.xml'] + ['/web_editor/static/src/xml/wysiwyg.xml'] ), jsLibs: [ '/web_editor/static/lib/cropper/js/cropper.js', diff --git a/addons/web_editor/static/src/js/wysiwyg/widgets/media.js b/addons/web_editor/static/src/js/wysiwyg/widgets/media.js index 0b113430352..906bd02ec04 100644 --- a/addons/web_editor/static/src/js/wysiwyg/widgets/media.js +++ b/addons/web_editor/static/src/js/wysiwyg/widgets/media.js @@ -12,7 +12,7 @@ var QWeb = core.qweb; var _t = core._t; var MediaWidget = Widget.extend({ - xmlDependencies: ['/web_editor/static/src/xml/editor.xml'], + xmlDependencies: ['/web_editor/static/src/xml/wysiwyg.xml'], events: { 'input input.o_we_search': '_onSearchInput', }, diff --git a/addons/web_editor/static/src/js/wysiwyg/widgets/media_dialog.js b/addons/web_editor/static/src/js/wysiwyg/widgets/media_dialog.js index e6cb1277a7e..1cb6689d02e 100644 --- a/addons/web_editor/static/src/js/wysiwyg/widgets/media_dialog.js +++ b/addons/web_editor/static/src/js/wysiwyg/widgets/media_dialog.js @@ -15,7 +15,7 @@ var _t = core._t; var MediaDialog = Dialog.extend({ template: 'wysiwyg.widgets.media', xmlDependencies: Dialog.prototype.xmlDependencies.concat( - ['/web_editor/static/src/xml/editor.xml'] + ['/web_editor/static/src/xml/wysiwyg.xml'] ), events: _.extend({}, Dialog.prototype.events, { 'click a[data-toggle="tab"]': '_onTabChange', diff --git a/addons/website/static/src/js/menu/customize.js b/addons/website/static/src/js/menu/customize.js index 6b54cf10416..fc254626dd2 100644 --- a/addons/website/static/src/js/menu/customize.js +++ b/addons/website/static/src/js/menu/customize.js @@ -9,7 +9,7 @@ var WebsiteAceEditor = require('website.ace'); var qweb = core.qweb; var CustomizeMenu = Widget.extend({ - xmlDependencies: ['/web_editor/static/src/xml/editor.xml'], + xmlDependencies: ['/website/static/src/xml/website.editor.xml'], events: { 'show.bs.dropdown': '_onDropdownShow', 'click .dropdown-item[data-view-id]': '_onCustomizeOptionClick', diff --git a/addons/website/static/src/js/menu/new_content.js b/addons/website/static/src/js/menu/new_content.js index 0e1a10ebc80..18e7e5a6904 100644 --- a/addons/website/static/src/js/menu/new_content.js +++ b/addons/website/static/src/js/menu/new_content.js @@ -12,7 +12,7 @@ var _t = core._t; var enableFlag = 'enable_new_content'; var NewContentMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({ - xmlDependencies: ['/web_editor/static/src/xml/editor.xml'], + xmlDependencies: ['/website/static/src/xml/website.editor.xml'], actions: _.extend({}, websiteNavbarData.WebsiteNavbarActionWidget.prototype.actions || {}, { close_all_widgets: '_handleCloseDemand', new_page: '_createNewPage',