summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/src/js
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2019-08-23 10:57:54 +0000
committerqsm-odoo <qsm@odoo.com>2019-08-28 09:04:25 +0000
commitb47f097feb7f99be1296cde1f0cd1e4f950d83fd (patch)
tree397f7248e6257fe91545b93ccccf5a531ad6b2a2 /addons/web_editor/static/src/js
parent7acb22a5e5c9beceb18ed6fea691e14502b93ad7 (diff)
[FIX] web_editor, *: review assets organisation
* mass_mailing, point_of_sale, website - Lib files were included twice - Variables files were split but added multiple times in the same assets bundle - Useless assets templates were defined or split - ... Part of https://github.com/odoo/odoo/pull/36068 Related to task-1942370
Diffstat (limited to 'addons/web_editor/static/src/js')
-rw-r--r--addons/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js5
1 files changed, 1 insertions, 4 deletions
diff --git a/addons/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js b/addons/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js
index 64b7c6a8f8c..c0709a2c90e 100644
--- a/addons/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js
+++ b/addons/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js
@@ -23,9 +23,6 @@ Wysiwyg.include({
init: function (parent, options) {
this._super.apply(this, arguments);
if (this.options.inIframe) {
- if (!this.options.iframeCssAssets) {
- this.options.iframeCssAssets = 'web_editor.wysiwyg_iframe_css_assets';
- }
this._onUpdateIframeId = 'onLoad_' + this.id;
}
},
@@ -133,4 +130,4 @@ Wysiwyg.include({
},
});
-}); \ No newline at end of file
+});