summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/src/js/transcoder.js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-02-02 14:55:52 +0100
committerChristophe Simonis <chs@odoo.com>2016-02-02 14:55:52 +0100
commit04416a5a6f1a3b4cf1a8bed8e9aee9c30c91a03e (patch)
tree1fd974be09d12c53ed02a221de553f6f83efc253 /addons/web_editor/static/src/js/transcoder.js
parent7e3d6e92b6a7af27d8c2ebb0dbbecba28c9f1877 (diff)
parent469e04e97c2aa60d9d41bd430e0aeba77ee6f9dd (diff)
[MERGE] forward port of branch saas-9 up to 469e04e
Diffstat (limited to 'addons/web_editor/static/src/js/transcoder.js')
-rw-r--r--addons/web_editor/static/src/js/transcoder.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/addons/web_editor/static/src/js/transcoder.js b/addons/web_editor/static/src/js/transcoder.js
index c26ba163d11..361c072a48c 100644
--- a/addons/web_editor/static/src/js/transcoder.js
+++ b/addons/web_editor/static/src/js/transcoder.js
@@ -173,7 +173,11 @@ var class_to_style = function ($editable) {
style = k+":"+v+";"+style;
}
});
- $target.attr("style", style);
+ if (_.isEmpty(style)) {
+ $target.removeAttr("style");
+ } else {
+ $target.attr("style", style);
+ }
});
};
// convert style into inline class from mail