From acacdff5af82ee3629bd150b42586890630f6728 Mon Sep 17 00:00:00 2001
From: Nicolas Bayet <nby@odoo.com>
Date: Thu, 24 Nov 2022 16:02:57 +0000
Subject: [PATCH] [FIX] web_editor: reset the options of the editor

Before this commit, when the editor was reset through updateWidget, the
options were not updated.

closes odoo/odoo#107029

X-original-commit: ffd77cf6aee37f8912e1367f8f9ca2f6344e9577
Signed-off-by: David Monjoie (dmo) <dmo@odoo.com>
---
 .../static/src/js/backend/html_field.js       |  4 +--
 .../static/src/js/wysiwyg/wysiwyg.js          | 30 ++++++++++---------
 .../static/src/js/wysiwyg/wysiwyg_iframe.js   |  4 +--
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/addons/web_editor/static/src/js/backend/html_field.js b/addons/web_editor/static/src/js/backend/html_field.js
index 94cac573b21..37bb2ad219b 100644
--- a/addons/web_editor/static/src/js/backend/html_field.js
+++ b/addons/web_editor/static/src/js/backend/html_field.js
@@ -62,9 +62,7 @@ export class HtmlFieldWysiwygAdapterComponent extends ComponentAdapter {
             !_.isEqual(lastRecordInfo, newRecordInfo) ||
             !_.isEqual(lastCollaborationChannel, newCollaborationChannel))
         {
-            this.widget.resetEditor(newValue, {
-                collaborationChannel: newCollaborationChannel,
-            });
+            this.widget.resetEditor(newValue, newProps.widgetArgs[0]);
             this.env.onWysiwygReset && this.env.onWysiwygReset();
         }
     }
diff --git a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
index 2d77f47fd36..e72b34e330b 100644
--- a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
+++ b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
@@ -78,11 +78,7 @@ const Wysiwyg = Widget.extend({
     init: function (parent, options) {
         this._super.apply(this, arguments);
         this.id = ++id;
-        this.options = options;
-        // autohideToolbar is true by default (false by default if navbar present).
-        this.options.autohideToolbar = typeof this.options.autohideToolbar === 'boolean'
-            ? this.options.autohideToolbar
-            : !options.snippets;
+        this.options = this._getEditorOptions(options);
         this.saving_mutex = new concurrency.Mutex();
         // Keeps track of color palettes per event name.
         this.colorpickers = {};
@@ -107,20 +103,19 @@ const Wysiwyg = Widget.extend({
      */
     start: async function () {
         await this._super.apply(this, arguments);
-        const options = this._editorOptions();
         // If this widget is started from the OWL legacy component, at the time
         // of start, the $el is not in the document yet. Some instruction in the
         // start rely on the $el being in the document at that time, including
         // code for the collaboration (for adding cursors) or the iframe loading
         // in mass_mailing.
-        if (options.autostart) {
+        if (this.options.autostart) {
             return this.startEdition();
         }
     },
     startEdition: async function () {
         const self = this;
 
-        var options = this._editorOptions();
+        const options = this.options;
 
         this.$editable = this.$editable || this.$el;
         if (options.value) {
@@ -1759,9 +1754,8 @@ const Wysiwyg = Widget.extend({
      * Handle custom keyboard shortcuts.
      */
     _handleShortcuts: function (e) {
-        const options = this._editorOptions();
         // Open the link tool when CTRL+K is pressed.
-        if (options.bindLinkTool && e && e.key === 'k' && (e.ctrlKey || e.metaKey)) {
+        if (this.options.bindLinkTool && e && e.key === 'k' && (e.ctrlKey || e.metaKey)) {
             e.preventDefault();
             this.openLinkToolsFromSelection();
         }
@@ -1970,8 +1964,14 @@ const Wysiwyg = Widget.extend({
             button.classList.toggle('active', button.dataset.value === value);
         }
     },
-    _editorOptions: function () {
-        return Object.assign({}, this.defaultOptions, this.options);
+    _getEditorOptions: function (options) {
+        const finalOptions = {...this.defaultOptions, ...options};
+        // autohideToolbar is true by default (false by default if navbar present).
+        finalOptions.autohideToolbar = typeof finalOptions.autohideToolbar === 'boolean'
+            ? finalOptions.autohideToolbar
+            : !options.snippets;
+
+        return finalOptions;
     },
     _insertSnippetMenu: function () {
         return this.snippetsMenu.insertBefore(this.$el);
@@ -2022,7 +2022,7 @@ const Wysiwyg = Widget.extend({
         }
     },
     _getPowerboxOptions: function () {
-        const editorOptions = this._editorOptions();
+        const editorOptions = this.options;
         const categories = [];
         const commands = [
             {
@@ -2470,7 +2470,9 @@ const Wysiwyg = Widget.extend({
         // No need for secure random number.
         return Math.floor(Math.random() * Math.pow(2, 52)).toString();
     },
-    resetEditor: function (value, { collaborationChannel } = {}) {
+    resetEditor: function (value, options) {
+        this.options = this._getEditorOptions(options);
+        const {collaborationChannel} = options;
         if (!this.ptp) {
             this.setValue(value);
             this.odooEditor.historyReset();
diff --git a/addons/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js b/addons/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js
index 8d2b5454aad..f5247e74ba5 100644
--- a/addons/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js
+++ b/addons/web_editor/static/src/js/wysiwyg/wysiwyg_iframe.js
@@ -68,8 +68,8 @@ Wysiwyg.include({
     /**
      * @override
      **/
-    _editorOptions: function () {
-        let options = this._super.apply(this, arguments);
+    _getEditorOptions: function () {
+        const options = this._super.apply(this, arguments);
         options.getContextFromParentRect = () => {
             return this.$iframe && this.$iframe.length ? this.$iframe[0].getBoundingClientRect() : { top: 0, left: 0 };
         };