diff options
| author | Olivier Dony <odo@openerp.com> | 2017-06-01 00:37:30 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2017-06-01 00:37:30 +0200 |
| commit | 5dd2cc8e6320c631a511c6dac98ae40e54d4a94d (patch) | |
| tree | ad5f44653ac11d4a8bdec256de4d20adda94091d /addons/web_editor/static/src/js/transcoder.js | |
| parent | 20c724479f2092f2d5f0b3c96f15bd6162e07968 (diff) | |
| parent | b9e220726730e2e0c25dae9952fa90e783fadc16 (diff) | |
[MERGE] Forward-port saas-14 up to b9e220726730e2e0c25dae9952fa90e783fadc16
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; }; |
