From d8796d429cf0a1b1df896944445ad2c6f91a8859 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 13 Aug 2012 13:46:38 +0200
Subject: [PATCH 1/5] Now uses the html field type for cl editor

bzr revid: nicolas.vanhoren@openerp.com-20120813114638-pla647nupeha1tim
---
 addons/web/static/src/js/view_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index baf8c151b83..1ee5d8477f6 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -4802,7 +4802,7 @@ instance.web.form.widgets = new instance.web.Registry({
     'email' : 'instance.web.form.FieldEmail',
     'url' : 'instance.web.form.FieldUrl',
     'text' : 'instance.web.form.FieldText',
-    'text_html' : 'instance.web.form.FieldTextHtml',
+    'html' : 'instance.web.form.FieldTextHtml',
     'date' : 'instance.web.form.FieldDate',
     'datetime' : 'instance.web.form.FieldDatetime',
     'selection' : 'instance.web.form.FieldSelection',

From 78f92ec0314c9076d9daf48eb8812615b42d8d08 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 13 Aug 2012 16:51:11 +0200
Subject: [PATCH 2/5] Some tuning in text html

bzr revid: nicolas.vanhoren@openerp.com-20120813145111-s8uw1x4fc26xe6xl
---
 addons/web/static/src/js/view_form.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 1ee5d8477f6..a7f35ad04de 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2404,11 +2404,9 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
             width:      width, // width not including margins, borders or padding
             height:     height, // height not including margins, borders or padding
             controls:   // controls to add to the toolbar
-                        "bold italic underline strikethrough | size " +
+                        "bold italic underline strikethrough " +
                         "| removeformat | bullets numbering | outdent " +
-                        "indent | link unlink",
-            sizes:      // sizes in the font size popup
-                        "1,2,3,4,5,6,7",
+                        "indent | link unlink | source",
             bodyStyle:  // style to assign to document body contained within the editor
                         "margin:4px; font:12px monospace; cursor:text; color:#1F1F1F"
         });

From 8c7b192ab7c89688a8c8f81c1a6d2be480610557 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 13 Aug 2012 17:22:27 +0200
Subject: [PATCH 3/5] Removed useless dependency between fieldtexthtml and
 fieldtext

bzr revid: nicolas.vanhoren@openerp.com-20120813152227-29l173q31tcwc9tq
---
 addons/web/static/src/js/view_form.js | 14 ++++----------
 addons/web/static/src/xml/base.xml    |  5 +++++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index a7f35ad04de..bd6d2c6f128 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2394,8 +2394,8 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
  * To find more information about CLEditor configutation: go to
  * http://premiumsoftware.net/cleditor/docs/GettingStarted.html
  */
-instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
-
+instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
+    template: 'FieldTextHtml',
     initialize_content: function() {
         this.$textarea = this.$element.find('textarea');
         var width = ((this.node.attrs || {}).editor_width || 468);
@@ -2411,22 +2411,16 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
                         "margin:4px; font:12px monospace; cursor:text; color:#1F1F1F"
         });
         this.$cleditor = this.$textarea.cleditor()[0];
-        // call super now, because cleditor resets the disable attr
-        this._super.apply(this, arguments);
-        // propagate disabled property to cleditor
-        this.$cleditor.disable(this.$textarea.prop('disabled'));
     },
-
     set_value: function(value_) {
         this._super.apply(this, arguments);
         this._dirty_flag = true;
+        this.render_value();
     },
-
     render_value: function() {
-        this._super.apply(this, arguments);
+        this.$textarea.val(this.get('value'));
         this.$cleditor.updateFrame();
     },
-
     get_value: function() {
         this.$cleditor.updateTextArea();
         return this.$textarea.val();
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 0eddd914f01..061f74c246f 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -975,6 +975,11 @@
         />
     </div>
 </t>
+<t t-name="FieldTextHtml">
+    <div class="oe_form_field oe_form_field_text" t-att-style="widget.node.attrs.style">
+            <textarea/>
+    </div>
+</t>
 <t t-name="web.datepicker">
     <span>
         <t t-set="placeholder" t-value="widget.getParent().node and widget.getParent().node.attrs.placeholder"/>

From 235f8996bf33a99e5f6c17328834e406274cdff9 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 13 Aug 2012 17:40:11 +0200
Subject: [PATCH 4/5] Implemented read only mode

bzr revid: nicolas.vanhoren@openerp.com-20120813154011-hgq3vxxdps5s9w91
---
 addons/web/static/src/js/view_form.js | 53 ++++++++++++++++-----------
 addons/web/static/src/xml/base.xml    |  5 ++-
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index bd6d2c6f128..08d6292effa 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2397,33 +2397,44 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
 instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldTextHtml',
     initialize_content: function() {
-        this.$textarea = this.$element.find('textarea');
-        var width = ((this.node.attrs || {}).editor_width || 468);
-        var height = ((this.node.attrs || {}).editor_height || 100);
-        this.$textarea.cleditor({
-            width:      width, // width not including margins, borders or padding
-            height:     height, // height not including margins, borders or padding
-            controls:   // controls to add to the toolbar
-                        "bold italic underline strikethrough " +
-                        "| removeformat | bullets numbering | outdent " +
-                        "indent | link unlink | source",
-            bodyStyle:  // style to assign to document body contained within the editor
-                        "margin:4px; font:12px monospace; cursor:text; color:#1F1F1F"
-        });
-        this.$cleditor = this.$textarea.cleditor()[0];
+        var self = this;
+        if (! this.get("effective_readonly")) {
+            self._updating_editor = false;
+            this.$textarea = this.$element.find('textarea');
+            var width = ((this.node.attrs || {}).editor_width || 468);
+            var height = ((this.node.attrs || {}).editor_height || 100);
+            this.$textarea.cleditor({
+                width:      width, // width not including margins, borders or padding
+                height:     height, // height not including margins, borders or padding
+                controls:   // controls to add to the toolbar
+                            "bold italic underline strikethrough " +
+                            "| removeformat | bullets numbering | outdent " +
+                            "indent | link unlink | source",
+                bodyStyle:  // style to assign to document body contained within the editor
+                            "margin:4px; font:12px monospace; cursor:text; color:#1F1F1F"
+            });
+            this.$cleditor = this.$textarea.cleditor()[0];
+            this.$cleditor.change(function() {
+                if (! self._updating_editor) {
+                    self.$cleditor.updateTextArea();
+                    self.set({'value': self.$textarea.val()});
+                }
+            });
+        }
     },
     set_value: function(value_) {
         this._super.apply(this, arguments);
-        this._dirty_flag = true;
         this.render_value();
     },
     render_value: function() {
-        this.$textarea.val(this.get('value'));
-        this.$cleditor.updateFrame();
-    },
-    get_value: function() {
-        this.$cleditor.updateTextArea();
-        return this.$textarea.val();
+        if (! this.get("effective_readonly")) {
+            this.$textarea.val(this.get('value'));
+            this._updating_editor = true;
+            this.$cleditor.updateFrame();
+            this._updating_editor = false;
+        } else {
+            this.$element.html(this.get('value'));
+        }
     },
 });
 
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 061f74c246f..9b22a7c7ff7 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -976,8 +976,11 @@
     </div>
 </t>
 <t t-name="FieldTextHtml">
-    <div class="oe_form_field oe_form_field_text" t-att-style="widget.node.attrs.style">
+    <div t-att-class="'oe_form_field oe_form_field_html' + (widget.get('effective_readonly') ? ' oe_form_embedded_html' : '')"
+            t-att-style="widget.node.attrs.style">
+        <t t-if="! widget.get('effective_readonly')">
             <textarea/>
+        </t>
     </div>
 </t>
 <t t-name="web.datepicker">

From 1ea62dd94c04bb59e88cf1170e08dc214b85fd19 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 13 Aug 2012 17:45:55 +0200
Subject: [PATCH 5/5] Added protection

bzr revid: nicolas.vanhoren@openerp.com-20120813154555-rw4kh1jxdbmg8xab
---
 addons/web/static/src/js/view_form.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 08d6292effa..af8cc791ac2 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2396,6 +2396,13 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
  */
 instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldTextHtml',
+    init: function() {
+        this._super.apply(this, arguments);
+        if (this.field.type !== 'html') {
+            throw new Error(_.str.sprintf(
+                _t("Error with field %s, it is not allowed to use the widget 'html' with any other field type than 'html'"), this.string));
+        }
+    },
     initialize_content: function() {
         var self = this;
         if (! this.get("effective_readonly")) {