From e5112ee00b1e552ab9127c910862accc4c9720c1 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Wed, 20 Jan 2016 00:14:00 +0100
Subject: [PATCH] [FIX] web_editor: use iframe only for html widget with
 style-inline mode

---
 addons/web_editor/static/src/js/backend.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js
index 6fe895b154b..b4e0898613d 100644
--- a/addons/web_editor/static/src/js/backend.js
+++ b/addons/web_editor/static/src/js/backend.js
@@ -65,12 +65,17 @@ var FieldTextHtmlSimple = widget.extend({
         this.$content = $();
 
         if (this.get("effective_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();
-            });
+            if (this.options['style-inline']) {
+                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.$content = $('<div class="note-editable o_readonly"/>');
+                this.$textarea.hide().after(this.$content);
+            }
         } else {
             this.$textarea.summernote(this._config());