[MERGE] forward port of branch saas-6 up to 7faf72c

5 files changed, 14 insertions, 6 deletions

diff --git a/addons/web_editor/static/src/css/snippets.css b/addons/web_editor/static/src/css/snippets.css
index 950e5eb4e70..b4d74eecac6 100644
--- a/addons/web_editor/static/src/css/snippets.css
+++ b/addons/web_editor/static/src/css/snippets.css
@@ -1,3 +1,4 @@
+@charset "UTF-8";
 /* ---- SNIPPET EDITOR ---- {{{ */
 #oe_snippets #o_left_bar, #oe_snippets #o_arrow {
   position: fixed;
@@ -8,6 +9,10 @@
   -moz-box-shadow: 0px 10px 10px -10px black inset;
   -webkit-box-shadow: 0px 10px 10px -10px black inset;
   box-shadow: 0px 10px 10px -10px black inset;
+  font-size: 14px;
+}
+#oe_snippets #o_left_bar .snippets_loading, #oe_snippets #o_arrow .snippets_loading {
+  color: white;
 }
 #oe_snippets #o_arrow {
   z-index: 1009;
@@ -487,4 +492,4 @@
 
 .move-important, .move-important * {
   cursor: move !important;
-}
\ No newline at end of file
+}
diff --git a/addons/web_editor/static/src/css/snippets.sass b/addons/web_editor/static/src/css/snippets.sass
index 2f042640b70..ed5bd46a525 100644
--- a/addons/web_editor/static/src/css/snippets.sass
+++ b/addons/web_editor/static/src/css/snippets.sass
@@ -13,6 +13,9 @@
         bottom: 0
         background: rgb(40,40,40)
         +box-shadow(0px 10px 10px -10px black inset)
+        font-size: 14px
+        .snippets_loading
+            color: white
     #o_arrow
         z-index: 1009
         width: 24px
diff --git a/addons/web_editor/static/src/js/snippets.editor.js b/addons/web_editor/static/src/js/snippets.editor.js
index 20fefdb4aef..fef552c0216 100644
--- a/addons/web_editor/static/src/js/snippets.editor.js
+++ b/addons/web_editor/static/src/js/snippets.editor.js
@@ -343,7 +343,7 @@ var BuildingBlock = Widget.extend({
 
         $html.find('.o_not_editable').attr("contentEditable", false);
 
-        $left_bar.append($html);
+        $left_bar.html($html);
 
         // animate for list of snippet blocks
         $left_bar.on('click', '.scroll-link', function (event) {
diff --git a/addons/web_editor/static/src/js/summernote.js b/addons/web_editor/static/src/js/summernote.js
index 3ce90c14496..d300f8b28ca 100644
--- a/addons/web_editor/static/src/js/summernote.js
+++ b/addons/web_editor/static/src/js/summernote.js
@@ -946,8 +946,7 @@ options.keyMap.pc['ESCAPE'] = 'cancel';
 options.keyMap.mac['SHIFT+TAB'] = 'untab';
 
 options.keyMap.mac['BACKSPACE'] = 'backspace';
-options.keyMap.mac['CMD+BACKSPACE'] = 'delete';
-options.keyMap.mac['SHIFT+BACKSPACE'] = 'delete';
+options.keyMap.mac['DELETE'] = 'delete';
 options.keyMap.mac['ENTER'] = 'enter';
 options.keyMap.mac['ESCAPE'] = 'cancel';
 
@@ -1816,7 +1815,6 @@ eventHandler.toolbar.button.updateRecentColor = function (elBtn, sEvent, sValue)
             font.style.backgroundColor = sValue !== 'inherit' ? sValue : "";
         }
     }
-    event.preventDefault();
     return false;
 };
 
diff --git a/addons/web_editor/static/src/xml/snippets.xml b/addons/web_editor/static/src/xml/snippets.xml
index ccced98af2c..0b194de6af9 100644
--- a/addons/web_editor/static/src/xml/snippets.xml
+++ b/addons/web_editor/static/src/xml/snippets.xml
@@ -20,7 +20,9 @@
                 <div>Insert Blocks</div>
                 <span class="fa fa-angle-double-right fa-1x" style="bottom: 10px;"></span>
             </div>
-            <div id="o_left_bar"></div>
+            <div id="o_left_bar">
+                <span class='snippets_loading'>Snippets are loading...</span>
+            </div>
         </div>
     </t>