[MERGE] forward port of branch saas-6 up to 081f21e

1 files changed, 3 insertions, 3 deletions

diff --git a/addons/web_editor/static/src/js/rte.summernote.js b/addons/web_editor/static/src/js/rte.summernote.js
index 1067576ad15..5b6b6d593e9 100644
--- a/addons/web_editor/static/src/js/rte.summernote.js
+++ b/addons/web_editor/static/src/js/rte.summernote.js
@@ -192,6 +192,8 @@ eventHandler.popover.button.update = function ($container, oStyle) {
 
     fn_boutton_update.call(this, $container, oStyle);
 
+    $container.find('.note-color').removeClass("hidden");
+
     if (oStyle.image) {
         $container.find('[data-event]').parent().removeClass("active");
 
@@ -212,8 +214,6 @@ eventHandler.popover.button.update = function ($container, oStyle) {
             $container.find('button[data-event="resizefa"][data-value="1"]').toggleClass("active", !$container.find('.active[data-event="resizefa"]').length);
 
             $container.find('button[data-event="imageShape"][data-value="fa-spin"]').toggleClass("active", $(oStyle.image).hasClass("fa-spin"));
-            
-            $container.find('.note-color').removeClass("hidden");
 
         } else {
 
@@ -228,7 +228,7 @@ eventHandler.popover.button.update = function ($container, oStyle) {
             $container.find('button[data-event="resize"][data-value="0.25"]').toggleClass("active", width === "25%");
 
             $container.find('button[data-event="imageShape"][data-value="shadow"]').toggleClass("active", $(oStyle.image).hasClass("shadow"));
-            
+
             if (!$(oStyle.image).is("img")) {
                 $container.find('.btn-group:has(button[data-event="imageShape"])').addClass("hidden");
             }