diff options
| author | Olivier Dony <odo@openerp.com> | 2017-06-01 01:10:29 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2017-06-01 01:10:29 +0200 |
| commit | ba15df47cb25625cb0921cba554aa0879048c90a (patch) | |
| tree | 3c9aea1bd49f22ab3e70742d8b33ec11e6e88a1b /addons/web_editor/static/src/js/transcoder.js | |
| parent | f9a1241721d1457dd7ddd0eebb1ec0ba4fba3225 (diff) | |
| parent | 17b847c0f67e51279e4c6d53e847d9918b41b7f7 (diff) | |
[MERGE] Forward-port saas-15 up to 17b847c0f67e51279e4c6d53e847d9918b41b7f7
Diffstat (limited to 'addons/web_editor/static/src/js/transcoder.js')
| -rw-r--r-- | addons/web_editor/static/src/js/transcoder.js | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/addons/web_editor/static/src/js/transcoder.js b/addons/web_editor/static/src/js/transcoder.js index 05068972532..6b42e028b3a 100644 --- a/addons/web_editor/static/src/js/transcoder.js +++ b/addons/web_editor/static/src/js/transcoder.js @@ -121,6 +121,16 @@ var getMatchedCSSRules = function (a) { } }); + // text-decoration rule is decomposed in -line, -color and -style. This is + // however not supported by many browser/mail clients and the editor does + // not allow to change -color and -style rule anyway + if (style['text-decoration-line']) { + style['text-decoration'] = style['text-decoration-line']; + delete style['text-decoration-line']; + delete style['text-decoration-color']; + delete style['text-decoration-style']; + } + return style; }; |