[MERGE] forward port of branch saas-7 up to cab5c48

1 files changed, 2 insertions, 2 deletions

diff --git a/addons/web_editor/static/src/js/transcoder.js b/addons/web_editor/static/src/js/transcoder.js
index 361c072a48c..11397063200 100644
--- a/addons/web_editor/static/src/js/transcoder.js
+++ b/addons/web_editor/static/src/js/transcoder.js
@@ -84,7 +84,7 @@ var getMatchedCSSRules = function (a) {
     var style = {};
     _.each(css, function (v,k) {
         _.each(v[1], function (v,k) {
-            if (v && k.indexOf('-webkit') === -1 && (!style[k] || style[k].indexOf('important') === -1 || v.indexOf('important') !== -1)) {
+            if (v && _.isString(v) && k.indexOf('-webkit') === -1 && (!style[k] || style[k].indexOf('important') === -1 || v.indexOf('important') !== -1)) {
                 style[k] = v;
             }
         });
@@ -195,7 +195,7 @@ var style_to_class = function ($editable) {
                 style = k+":"+v+";"+style;
             }
         });
-        css = $c.attr("style", style).attr("style").split(/\s*;\s*/);
+        css = ($c.attr("style", style).attr("style") || "").split(/\s*;\s*/);
         style = $target.attr("style") || "";
         _.each(css, function (v) {
             style = style.replace(v, '');