[MERGE] forward port branch saas-10 up to e634a52

addons/web_editor/static/src/js/snippets.editor.js

@@ -356,6 +356,9 @@ var BuildingBlock = Widget.extend({
         });
 
         self.make_snippet_draggable(self.$snippets);
+
+        this.show_blocks();
+        this.$el.on("snippet-dropped snippet-removed", this.show_blocks.bind(this));
     },
 
     cover_target: function ($el, $target) {
@@ -1074,6 +1077,8 @@ var Editor = Class.extend({
         $(".note-control-selection").hide();
         $('.o_table_handler').remove();
 
+        this.buildingBlock.$el.trigger("snippet-removed");
+
         return false;
     },
 

addons/web_editor/static/src/xml/snippets.xml

@@ -60,7 +60,7 @@
 
     <!-- t-field options -->
     <t t-name="web_editor.many2one.button">
-        <div class="dropdown">
+        <div class="btn-group">
             <a href="#" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" title="Search Contact"><i class="fa fa-search"></i></a>
             <ul class="dropdown-menu contact_menu" role="menu">
                 <li><a><input href="#" type="email" placeholder="Search"/></a></li>