From 897290dd3ff218ddc12dcdc6c936a8725813cefe Mon Sep 17 00:00:00 2001
From: Nicolas Lempereur <nle@odoo.com>
Date: Wed, 16 Nov 2016 11:01:52 +0100
Subject: [PATCH] [IMP] web_editor: don't lose modified code view content

The scenario when using the code view is the following :

- click on code view button to use code view
- make changes
- click on code view button to get back to wysiwyg view
- save from the wysiwyg view

If the 3rd step is not done:

- for the inline editor, we lose the changes that have been done in code
  view,
- for the iframe editor, we lose the entirety of the content.

At one time the user was forced to go back to wysiwyg before being able
to save, but this have been removed hence the present usability issue.

With this fix, when the editor content is saved, if the user is in code
view he is automatically set back to wysiwyg view.

closes #14339
opw-693052
---
 addons/web_editor/static/src/js/backend.js        | 10 ++++++++++
 addons/web_editor/static/src/js/rte.summernote.js |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js
index 0cd9abb5596..6b956c344db 100644
--- a/addons/web_editor/static/src/js/backend.js
+++ b/addons/web_editor/static/src/js/backend.js
@@ -161,6 +161,11 @@ var FieldTextHtmlSimple = widget.extend({
         return !this.get('value') || this.get('value') === "<p><br/></p>" || !this.get('value').match(/\S/);
     },
     commit_value: function() {
+        // leave code view before saving
+        if (this.$content.prev('textarea').length === 1) {
+            var layoutInfo = { 'editor': function() { return this.$content; }.bind(this) };
+            $.summernote.pluginEvents.codeview(undefined, undefined, layoutInfo);
+        }
         if (this.options['style-inline']) {
             transcoder.class_to_style(this.$content);
             transcoder.font_to_img(this.$content);
@@ -374,6 +379,11 @@ var FieldTextHtml = widget.extend({
             this._dirty_flag = false;
             return this.editor.save();
         } else if (this._dirty_flag && this.editor && this.editor.buildingBlock) {
+            // leave code view before saving
+            if (this.$content.prev('textarea').length === 1) {
+                var layoutInfo = { 'editor': function() { return this.$content; }.bind(this) };
+                $.summernote.pluginEvents.codeview(undefined, undefined, layoutInfo);
+            }
             this.editor.buildingBlock.clean_for_save();
             this.internal_set_value( this.$content.html() );
         }
diff --git a/addons/web_editor/static/src/js/rte.summernote.js b/addons/web_editor/static/src/js/rte.summernote.js
index 8cbb80583b7..b7d4c191b7e 100644
--- a/addons/web_editor/static/src/js/rte.summernote.js
+++ b/addons/web_editor/static/src/js/rte.summernote.js
@@ -485,6 +485,8 @@ function prettify_html(html) {
     }
     return result;
 }
+
+// Change Warning: called with dummy arguments to quit code view before saving
 $.summernote.pluginEvents.codeview = function (event, editor, layoutInfo) {
     if (layoutInfo.toolbar) {
         return eventHandler.modules.codeview.toggle(layoutInfo);