diff options
| author | Christophe Matthieu <chm@odoo.com> | 2019-01-28 09:39:56 +0000 |
|---|---|---|
| committer | Christophe Matthieu <chm@odoo.com> | 2019-02-14 15:11:19 +0000 |
| commit | b49745e52d7a7bc27afd416206dcd5fa242aa07a (patch) | |
| tree | ae6a047da7e77b951db241e1342278ce543972e2 /addons/mass_mailing/static | |
| parent | 7daa85dd12ff522be510bc2f8db1d968cae7d891 (diff) | |
[IMP] web_editor: lazy load the wysiwyg
Issue: wysiwyg asset slow down the loading of the website, error
inadvertently introduced: https://github.com/odoo/odoo/pull/29775
The assets are now loaded assynchroneously, when the editor is needed,
its assets will be loaded.
closes odoo/odoo#30700
Diffstat (limited to 'addons/mass_mailing/static')
| -rw-r--r-- | addons/mass_mailing/static/src/js/mass_mailing_widget.js | 7 | ||||
| -rw-r--r-- | addons/mass_mailing/static/tests/mass_mailing_html_tests.js | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/addons/mass_mailing/static/src/js/mass_mailing_widget.js b/addons/mass_mailing/static/src/js/mass_mailing_widget.js index 12eec137545..cf97d3fd9a0 100644 --- a/addons/mass_mailing/static/src/js/mass_mailing_widget.js +++ b/addons/mass_mailing/static/src/js/mass_mailing_widget.js @@ -12,6 +12,9 @@ var _t = core._t; var MassMailingFieldHtml = FieldHtml.extend({ xmlDependencies: (FieldHtml.prototype.xmlDependencies || []).concat(["/mass_mailing/static/src/xml/mass_mailing.xml"]), + jsLibs: [ + '/mass_mailing/static/src/js/mass_mailing_snippets.js', + ], custom_events: _.extend({}, FieldHtml.prototype.custom_events, { snippets_loaded: '_onSnippetsLoaded', @@ -305,7 +308,7 @@ var MassMailingFieldHtml = FieldHtml.extend({ this.$content.focusIn(); } } - this.wysiwyg.snippets.trigger('reload_snippet_dropzones'); + this.wysiwyg.trigger('reload_snippet_dropzones'); }, //-------------------------------------------------------------------------- @@ -442,7 +445,7 @@ var MassMailingFieldHtml = FieldHtml.extend({ selectedTheme = themeParams; // Notify form view - self.wysiwyg._onChange(); + self.wysiwyg.getEditable().trigger('change'); $dropdown.find('.dropdown-menu').removeClass('show'); $dropdown.find('.dropdown-item.selected').removeClass('selected'); $dropdown.find('.dropdown-item:eq(' + themesParams.indexOf(selectedTheme) + ')').addClass('selected'); diff --git a/addons/mass_mailing/static/tests/mass_mailing_html_tests.js b/addons/mass_mailing/static/tests/mass_mailing_html_tests.js index 36bea2db624..0657278ec16 100644 --- a/addons/mass_mailing/static/tests/mass_mailing_html_tests.js +++ b/addons/mass_mailing/static/tests/mass_mailing_html_tests.js @@ -46,7 +46,7 @@ QUnit.module('field html', { } if (xmlId === 'template.assets_all_style') { return $.when({ - cssLibs: $('head link[href]:not([type="image/x-icon"])').map(function () { + cssLibs: $('link[href]:not([type="image/x-icon"])').map(function () { return $(this).attr('href'); }).get(), cssContents: ['.field_body {background-color: red;}'] |
