Skip to content

Commit 6c3c8f8

Browse files
[IMP] dubious changes
1 parent ffc7fcc commit 6c3c8f8

File tree

3 files changed

+11
-20
lines changed

3 files changed

+11
-20
lines changed

addons/mass_mailing/__manifest__.py

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -95,38 +95,29 @@
9595
],
9696
'application': True,
9797
'assets': {
98-
'mass_mailing.assets_builder': [ # equivalent html_builder.assets in website_builder_action.xml
98+
'mass_mailing.assets_builder': [
9999
# lazy builder assets NOT applied in iframe
100100
('include', 'html_builder.assets'),
101101
'mass_mailing/static/src/builder/**/*',
102102
],
103-
'mass_mailing.assets_iframe_style': [ # equivalent website.inside_builder_style in website_builder_action.js
103+
'mass_mailing.assets_iframe_style': [
104104
# minimal style assets required to view the mail content
105105
# convert_inline ONLY uses this and inline styles.
106-
#
107-
# TODO EGGMAIL: recreate a scss bundle that is strictly used in relation with convert_inline
108-
# if there is "editor style" to include, put it in `mass_mailing.assets_iframe_edit``
109-
### CSS part of wysiwyg_iframe_editor_assets
110-
111-
### iframe_css_assets_edit fast selection
112-
('include', 'mass_mailing.iframe_css_assets_edit'),
106+
# TODO EGGMAIL: reduce included bundles
107+
('include', 'mass_mailing.assets_mail_themes'),
108+
('include', 'web.assets_frontend'),
109+
('after', 'web/static/lib/bootstrap/scss/_maps.scss', 'mass_mailing/static/src/scss/mass_mailing.ui.scss'),
110+
('include', 'web_editor.backend_assets_wysiwyg'),
111+
('include', 'web_editor.assets_snippets_menu'),
113112
('include', 'web_editor.wysiwyg_iframe_editor_assets'),
114113
('include', 'html_builder.inside_builder_style'),
114+
'mass_mailing/static/src/scss/mass_mailing_mail.scss',
115115
'mass_mailing/static/src/iframe_assets/**/*',
116116
'mass_mailing/static/src/theme_assets/**/*',
117117
],
118118
'html_builder.iframe_add_dialog': [
119119
'mass_mailing/static/src/builder/snippet_viewer/*.scss',
120120
],
121-
'mass_mailing.iframe_css_assets_edit': [
122-
('include', 'mass_mailing.assets_mail_themes'),
123-
('include', 'web.assets_frontend'),
124-
('after', 'web/static/lib/bootstrap/scss/_maps.scss', 'mass_mailing/static/src/scss/mass_mailing.ui.scss'),
125-
('include', 'web_editor.backend_assets_wysiwyg'),
126-
('include', 'web_editor.assets_snippets_menu'),
127-
128-
'mass_mailing/static/src/scss/mass_mailing_mail.scss',
129-
],
130121
'mass_mailing.mailing_assets': [
131122
'mass_mailing/static/src/scss/mailing_portal.scss',
132123
'mass_mailing/static/src/interactions/subscribe.js',

addons/mass_mailing/views/mailing_mobile_preview_content.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<template id="mass_mailing.preview_content_mobile">
44
<html>
55
<head>
6-
<t t-call-assets="mass_mailing.iframe_css_assets_edit" t-js="False"></t>
6+
<t t-call-assets="mass_mailing.assets_iframe_style" t-js="False"></t>
77
</head>
88
<body></body>
99
</html>

addons/test_mass_mailing/models/ir_qweb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ class IrQweb(models.AbstractModel):
77

88
def _get_bundles_to_pregenarate(self):
99
js_assets, css_assets = super()._get_bundles_to_pregenarate()
10-
assets = {'mass_mailing.iframe_css_assets_edit'}
10+
assets = {'mass_mailing.assets_iframe_style'}
1111
return (js_assets | assets, css_assets | assets)

0 commit comments

Comments
 (0)