[MERGE] forward port of branch 9.0 up to 365e298

3 files changed, 68 insertions, 28 deletions

diff --git a/addons/web_editor/static/src/css/backend.css b/addons/web_editor/static/src/css/backend.css
index 42871187d12..33a7155354c 100644
--- a/addons/web_editor/static/src/css/backend.css
+++ b/addons/web_editor/static/src/css/backend.css
@@ -5,14 +5,17 @@
     line-height: initial !important;
     color: initial !important;
 }
-.oe_form_field_html_text .note-editable.o_readonly {
+.oe_form_field_html_text iframe.o_readonly {
     min-height: 1em;
+    width: 100%;
+    margin: 0;
+    padding: 0;
+    border: 0;
 }
 .oe_form_field_html_text .note-editable p {
-    margin: initial;
-}
-.oe_form_field_html_text .note-editable a, .oe_form_field_html_text .note-editable a:hover {
-    color: initial;
+    font-family: 'Lucida Grande', Helvetica, Verdana, Arial, sans-serif;
+    -webkit-margin-before: 0;
+    font-size: 13px;
 }
 
 .oe_form_field_html iframe {
@@ -50,7 +53,6 @@
     overflow: hidden !important;
 }
 
-
 .openerp .oe_form .oe_form_field_html_translate textarea {
     min-width: 60px;
     width: 100%;
diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js
index acf603697b8..6fe895b154b 100644
--- a/addons/web_editor/static/src/js/backend.js
+++ b/addons/web_editor/static/src/js/backend.js
@@ -62,9 +62,15 @@ var FieldTextHtmlSimple = widget.extend({
     initialize_content: function() {
         var self = this;
         this.$textarea = this.$("textarea").val(this.get('value') || "<p><br/></p>");
+        this.$content = $();
 
         if (this.get("effective_readonly")) {
-            this.$textarea.hide().after('<div class="note-editable o_readonly"/>');
+            this.$textarea.hide().after('<iframe class="o_readonly"/>');
+            setTimeout(function () {
+                self.$content = $("body", self.$('iframe').contents()[0]);
+                self.$content.html(self.text_to_html(self.get('value')));
+                self.resize();
+            });
         } else {
             this.$textarea.summernote(this._config());
 
@@ -77,8 +83,10 @@ var FieldTextHtmlSimple = widget.extend({
             var reset = _.bind(this.reset_history, this);
             this.view.on('load_record', this, reset);
             setTimeout(reset, 0);
+
+            this.$content = this.$('.note-editable:first');
+            transcoder.style_to_class(this.$content);
         }
-        this.$content = this.$('.note-editable:first');
 
         $(".oe-view-manager-content").on("scroll", function () {
             $('.o_table_handler').remove();
@@ -98,7 +106,7 @@ var FieldTextHtmlSimple = widget.extend({
             value = '<p><br/></p>';
         } else {
             value = "<p>"+value.split(/<br\/?>/).join("<br/></p><p>")+"</p>";
-            value = value.replace(/<p><\/p>/g, '').replace('<p><p>', '<p>').replace('</p></p>', '</p>');
+            value = value.replace(/<p><\/p>/g, '').replace('<p><p>', '<p>').replace('<p><p ', '<p ').replace('</p></p>', '</p>');
         }
         return value;
     },
@@ -113,10 +121,18 @@ var FieldTextHtmlSimple = widget.extend({
             return this.$content.focus();
         };
     },
+    resize: function() {
+        this.$('iframe').css('height', '0px').css('height', Math.max(180, Math.min(this.$content[0] ? this.$content[0].scrollHeight : 0, 500)) + 'px');
+    },
     render_value: function() {
         var value = this.get('value');
         this.$textarea.val(value || '');
         this.$content.html(this.text_to_html(value));
+        if (this.get("effective_readonly")) {
+            this.resize();
+        } else {
+            transcoder.style_to_class(this.$content);
+        }
         if (this.$content.is(document.activeElement)) {
             this.focus();
         }
diff --git a/addons/web_editor/static/src/js/transcoder.js b/addons/web_editor/static/src/js/transcoder.js
index bd7848d2e97..5e699367dc2 100644
--- a/addons/web_editor/static/src/js/transcoder.js
+++ b/addons/web_editor/static/src/js/transcoder.js
@@ -30,9 +30,7 @@ var getMatchedCSSRules = function (a) {
                     var selectorText = rules[r].selectorText;
                     if (selectorText &&
                             rules[r].cssText &&
-                            selectorText.indexOf(".") !== -1 &&
-                            selectorText.indexOf(".note-") === -1 &&
-
+                            selectorText !== "*" &&
                             selectorText.indexOf(":hover") === -1 &&
                             selectorText.indexOf(":before") === -1 &&
                             selectorText.indexOf(":after") === -1 &&
@@ -61,6 +59,9 @@ var getMatchedCSSRules = function (a) {
                 var style_obj = {};
                 for (var k=0, len=style.length; k<len; k++) {
                     style_obj[style[k]] = style[style[k].replace(/-(.)/g, function (a, b) { return b.toUpperCase(); })];
+                    if (new RegExp(style[k] + '\s*:[^:;]+!important' ).test(style.cssText)) {
+                        style_obj[style[k]] += ' !important';
+                    }
                 }
                 rulesCache[r].style = style = style_obj;
             }
@@ -83,12 +84,37 @@ var getMatchedCSSRules = function (a) {
     var style = {};
     _.each(css, function (v,k) {
         _.each(v[1], function (v,k) {
-            if (!style[k] || style[k].indexOf('important') === -1 || v.indexOf('important') !== -1) {
+            if (k.indexOf('-webkit') === -1 && (!style[k] || style[k].indexOf('important') === -1 || v.indexOf('important') !== -1)) {
                 style[k] = v;
             }
         });
     });
-    return cache[a.tagName + "." +a.className] = style;
+
+    _.each(style, function (v,k) {
+        if (v.indexOf('important') !== -1) {
+            style[k] = v.slice(0, v.length-11);
+        }
+    });
+
+    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'];
+    }
+
+    return a.className ? cache[a.tagName + "." +a.className] = style : style;
 };
 
 // convert font awsome into image
@@ -138,13 +164,12 @@ var class_to_style = function ($editable) {
     if (!rulesCache.length) {
         getMatchedCSSRules($editable[0]);
     }
-    var selector = _.map(rulesCache, function (a) { return a.selector;}).join(",");
-    $editable.find(selector).each(function () {
+    $editable.find('*').each(function () {
         var $target = $(this);
         var css = getMatchedCSSRules(this);
         var style = $target.attr("style") || "";
         _.each(css, function (v,k) {
-            if (style.indexOf(k) === -1) {
+            if (!(new RegExp('(^|;)\s*' + k).test(style))) {
                 style = k+":"+v+";"+style;
             }
         });
@@ -154,23 +179,15 @@ var class_to_style = function ($editable) {
 // convert style into inline class from mail
 var style_to_class = function ($editable) {
     getMatchedCSSRules($editable[0]);
-    var classes = [];
-    $editable.find("[class]").each(function () {
-        classes = classes.concat(this.className.split(/\s+/));
-    });
-    classes = _.compact(classes);
-
-    var maybe_selector = _.filter(rulesCache, function (a) { return !!_.find(classes, function (b) { return a.selector.indexOf("."+b) !== -1; } ); });
-    var selector = _.map(maybe_selector, function (a) { return a.selector;}).join(",");
 
     var $c = $('<span/>').appendTo("body");
 
-    $editable.find(selector).each(function () {
+    $editable.find('*').each(function () {
         var $target = $(this);
         var css = getMatchedCSSRules(this);
         var style = "";
         _.each(css, function (v,k) {
-            if (style.indexOf(k) === -1) {
+            if (!(new RegExp('(^|;)\s*' + k).test(style))) {
                 style = k+":"+v+";"+style;
             }
         });
@@ -179,7 +196,12 @@ var style_to_class = function ($editable) {
         _.each(css, function (v) {
             style = style.replace(v, '');
         });
-        $target.attr("style", style.replace(/;+(\s;)*/g, ';').replace(/^;/g, ''));
+        style = style.replace(/;+(\s;)*/g, ';').replace(/^;/g, '');
+        if (style !== '') {
+            $target.attr("style", style);
+        } else {
+            $target.removeAttr("style");
+        }
     });
     $c.remove();
 };