Skip to content

Commit b386eed

Browse files
committed
[FIX] mass_mailing: ensure mailing snippets are in same window as others
Mass Mailing needs to extend the registry of wysiwyg snippets but couldn't do so because they didn't live in the same window. This moves the mass mailing snippets to the top window.
1 parent abe4856 commit b386eed

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

addons/mass_mailing/static/src/js/mass_mailing_widget.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ var MassMailingFieldHtml = FieldHtml.extend({
1414
xmlDependencies: (FieldHtml.prototype.xmlDependencies || []).concat(["/mass_mailing/static/src/xml/mass_mailing.xml"]),
1515
jsLibs: [
1616
'/mass_mailing/static/src/js/mass_mailing_link_dialog_fix.js',
17+
'/mass_mailing/static/src/js/mass_mailing_snippets.js',
1718
],
1819

1920
custom_events: _.extend({}, FieldHtml.prototype.custom_events, {
@@ -33,9 +34,7 @@ var MassMailingFieldHtml = FieldHtml.extend({
3334
// All the code related to this __extraAssetsForIframe variable is an
3435
// ugly hack to restore mass mailing options in stable versions. The
3536
// whole logic has to be refactored as soon as possible...
36-
this.__extraAssetsForIframe = [{
37-
jsLibs: ['/mass_mailing/static/src/js/mass_mailing_snippets.js'],
38-
}];
37+
this.__extraAssetsForIframe = [{jsLibs: []}];
3938
},
4039

4140
//--------------------------------------------------------------------------

0 commit comments

Comments
 (0)