From 935ca62a1fd77d4efecbf7f8df5d022bcb8f758a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Theys?= <seb@odoo.com>
Date: Mon, 4 Jul 2022 10:13:13 +0000
Subject: [PATCH] [IMP] mail: remove _updateChatterContainerTarget

It is only called inside `_interchangeChatter`, therefore its code can be moved.

Part of task-2871070

Part-of: odoo/odoo#95218
---
 .../widgets/form_renderer/form_renderer.js    | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/addons/mail/static/src/widgets/form_renderer/form_renderer.js b/addons/mail/static/src/widgets/form_renderer/form_renderer.js
index c07ca8689ad..3a55cce5641 100644
--- a/addons/mail/static/src/widgets/form_renderer/form_renderer.js
+++ b/addons/mail/static/src/widgets/form_renderer/form_renderer.js
@@ -156,14 +156,31 @@ FormRenderer.include({
      */
     _interchangeChatter() {
         const $sheetBg = this.$('.o_form_sheet_bg');
-        this._updateChatterContainerTarget();
         if (this._isChatterAside()) {
+            this._chatterContainerTarget.classList.add('o-aside');
+            this._chatterContainerTarget.classList.remove('o-isInFormSheetBg');
             $(this._chatterContainerTarget).insertAfter($sheetBg);
-        } else if (this.isChatterInSheet) {
-            const $sheet = this.$('.o_form_sheet');
-            dom.append($sheet, $(this._chatterContainerTarget));
         } else {
-            dom.append($sheetBg, $(this._chatterContainerTarget));
+            this._chatterContainerTarget.classList.remove('o-aside');
+            if (this.isChatterInSheet) {
+                this._chatterContainerTarget.classList.remove('o-isInFormSheetBg');
+                const $sheet = this.$('.o_form_sheet');
+                dom.append($sheet, $(this._chatterContainerTarget), {
+                    callbacks: [],
+                    in_DOM: this._isInDom,
+                });
+            } else {
+                if (this.hasAttachmentViewer()) {
+                    this._chatterContainerTarget.classList.add('o-isInFormSheetBg');
+                    dom.append($sheetBg, $(this._chatterContainerTarget), {
+                        callbacks: [],
+                        in_DOM: this._isInDom,
+                    });
+                } else {
+                    this._chatterContainerTarget.classList.remove('o-isInFormSheetBg');
+                    $(this._chatterContainerTarget).insertAfter($sheetBg);
+                }
+            }
         }
         if (this.hasAttachmentViewer()) {
             $(this.attachmentViewerTarget).insertAfter($sheetBg);
@@ -213,24 +230,6 @@ FormRenderer.include({
             }
         }
     },
-    /**
-     * Add a class to allow styling of chatter depending on the fact is is
-     * printed aside or underneath the form sheet.
-     *
-     * @private
-     */
-    _updateChatterContainerTarget() {
-        if (this._isChatterAside()) {
-            this._chatterContainerTarget.classList.add('o-aside');
-        } else {
-            this._chatterContainerTarget.classList.remove('o-aside');
-        }
-        if (this.hasAttachmentViewer()) {
-            this._chatterContainerTarget.classList.add('o-isInFormSheetBg');
-        } else {
-            this._chatterContainerTarget.classList.remove('o-isInFormSheetBg');
-        }
-    },
     /**
      * @private
      * @param {OdooEvent} ev