diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-03-17 17:55:30 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-03-17 17:55:30 +0100 |
| commit | 31ebb077734a4fda87df8eb19a88c0591f7e79e2 (patch) | |
| tree | 5d98b60cf7771f05cfe1740f5475e3e1575b2cc9 /addons/web_editor | |
| parent | 2c1257fe88a20d0f501977c02863f818ca7d1dd4 (diff) | |
| parent | aefdf96c25973778f3a00c06b107c30e440b0d94 (diff) | |
[MERGE] forward port branch saas-11 up to aefdf96c259
Diffstat (limited to 'addons/web_editor')
| -rw-r--r-- | addons/web_editor/static/src/js/transcoder.js | 36 | ||||
| -rw-r--r-- | addons/web_editor/static/src/xml/backend.xml | 8 |
2 files changed, 26 insertions, 18 deletions
diff --git a/addons/web_editor/static/src/js/transcoder.js b/addons/web_editor/static/src/js/transcoder.js index 20d4f5844af..fa7b4023377 100644 --- a/addons/web_editor/static/src/js/transcoder.js +++ b/addons/web_editor/static/src/js/transcoder.js @@ -98,20 +98,28 @@ var getMatchedCSSRules = function (a) { if (style.display === 'block') { delete style.display; } - if (style['margin-top']) { - style.margin = (style['margin-top'] || 0) + ' ' + (style['margin-right'] || 0) + ' ' + (style['margin-bottom'] || 0) + ' ' + (style['margin-left'] || 0); - delete style['margin-top']; - delete style['margin-right']; - delete style['margin-bottom']; - delete style['margin-left']; - } - if (style['padding-top']) { - style.padding = (style['padding-top'] || 0) + ' ' + (style['padding-right'] || 0) + ' ' + (style['padding-bottom'] || 0) + ' ' + (style['padding-left'] || 0); - delete style['padding-top']; - delete style['padding-right']; - delete style['padding-bottom']; - delete style['padding-left']; - } + + _.each(['margin', 'padding'], function(p) { + if (style[p+'-top'] || style[p+'-right'] || style[p+'-bottom'] || style[p+'-left']) { + if (style[p+'-top'] === style[p+'-right'] && style[p+'-top'] === style[p+'-bottom'] && style[p+'-top'] === style[p+'-left']) { + // keep => property: [top/right/bottom/left value]; + style[p] = style[p+'-top']; + } + else { + // keep => property: [top value] [right value] [bottom value] [left value]; + style[p] = (style[p+'-top'] || 0) + ' ' + (style[p+'-right'] || 0) + ' ' + (style[p+'-bottom'] || 0) + ' ' + (style[p+'-left'] || 0); + if (style[p].indexOf('inherit') !== -1 || style[p].indexOf('initial') !== -1) { + // keep => property-top: [top value]; property-right: [right value]; property-bottom: [bottom value]; property-left: [left value]; + delete style[p]; + return; + } + } + delete style[p+'-top']; + delete style[p+'-right']; + delete style[p+'-bottom']; + delete style[p+'-left']; + } + }); return style; }; diff --git a/addons/web_editor/static/src/xml/backend.xml b/addons/web_editor/static/src/xml/backend.xml index 4035752cea5..5c85996e890 100644 --- a/addons/web_editor/static/src/xml/backend.xml +++ b/addons/web_editor/static/src/xml/backend.xml @@ -38,11 +38,11 @@ -webkit-border-radius: 3px; border-radius: 3px; background: white;"> + <option value="en_US" t-att-selected="'en_US' == widget.lang ? 'selected' : null"> + <t t-if="!widget.get('effective_readonly')">English (edit mode)</t> + <t t-if="widget.get('effective_readonly')">English</t> + </option> <t t-foreach="widget.languages" t-as="lang"> - <option value="en_US" t-att-selected="'en_US' == widget.lang ? 'selected' : null"> - <t t-if="!widget.get('effective_readonly')">English (edit mode)</t> - <t t-if="widget.get('effective_readonly')">English</t> - </option> <option t-att-value="lang.code" t-att-selected="lang.code == widget.lang ? 'selected' : null"><t t-esc="lang.name"/></option> </t> </select> |