From 08d72a615f507527345b94cd4ac03c8da6a6cc83 Mon Sep 17 00:00:00 2001
From: Antoine Guenet <age@odoo.com>
Date: Fri, 6 Nov 2020 15:30:07 +0000
Subject: [PATCH] [FIX] web_editor: restore removal of spinner

---
 addons/web_editor/static/src/js/frontend/loader.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/addons/web_editor/static/src/js/frontend/loader.js b/addons/web_editor/static/src/js/frontend/loader.js
index 6ca492fc084..720cdef1b22 100644
--- a/addons/web_editor/static/src/js/frontend/loader.js
+++ b/addons/web_editor/static/src/js/frontend/loader.js
@@ -33,6 +33,10 @@ async function createWysiwyg(parent, options, additionnalAssets = []) {
 }
 
 async function loadFromTextarea(parent, textarea, options) {
+    var loading = textarea.nextElementSibling;
+    if (loading && !loading.classList.contains('o_wysiwyg_loading')) {
+        loading = null;
+    }
     const $textarea = $(textarea);
     const currentOptions = Object.assign({}, options);
     if (!currentOptions.value || !currentOptions.value.trim()) {
@@ -76,6 +80,11 @@ async function loadFromTextarea(parent, textarea, options) {
         $textarea.val(await wysiwyg.getValue());
     });
 
+    // Remove the loading spinner.
+    if (loading) {
+        loading.parentNode.removeChild(loading);
+    }
+
     return wysiwyg;
 }