diff options
| author | Martin Trigaux <mat@odoo.com> | 2015-12-01 10:54:51 +0100 |
|---|---|---|
| committer | Martin Trigaux <mat@odoo.com> | 2015-12-01 10:54:51 +0100 |
| commit | 87f96c942ab4381b489db5b6bf5de959f0ec3d7f (patch) | |
| tree | e9302d09e1fce1d4544e7fa92d4465105ded0140 /addons/website_mass_mailing/static/src/js | |
| parent | d025251c7e4ee4c26462e61b5d63e5c5d58689f8 (diff) | |
| parent | 90254beedbb6a9bdf055ae582af866073eab4f2c (diff) | |
[MERGE] forward port of branch saas-7 up to 90254bee
Diffstat (limited to 'addons/website_mass_mailing/static/src/js')
| -rw-r--r-- | addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js b/addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js index e5ff84677c7..10f5771139f 100644 --- a/addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js +++ b/addons/website_mass_mailing/static/src/js/website_mass_mailing.editor.js @@ -68,9 +68,9 @@ options.registry.newsletter_popup = mass_mailing_common.extend({ }); web_editor.Class.include({ - edit: function () { - this._super(); + start: function () { $('body').on('click','#edit_dialog',_.bind(this.edit_dialog, this.rte.editor)); + return this._super(); }, save : function() { var $target = $('#wrapwrap').find('#o_newsletter_popup'); |