diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-15 18:55:01 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-15 18:55:01 +0200 |
| commit | f8a601cad7becde53e7dc4635cb993a89a174ebc (patch) | |
| tree | 5f9ecf1240c0b6bc4795e1ed2da2a9fb79b44f65 /addons/web_editor/static/src | |
| parent | f83b5a8e560cd70493dd5c135d9538e0c6a83083 (diff) | |
| parent | e634a52cace081edfce324f14228ddb419af0a31 (diff) | |
[MERGE] forward port branch saas-10 up to e634a52
Diffstat (limited to 'addons/web_editor/static/src')
| -rw-r--r-- | addons/web_editor/static/src/js/snippets.editor.js | 5 | ||||
| -rw-r--r-- | addons/web_editor/static/src/xml/snippets.xml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/addons/web_editor/static/src/js/snippets.editor.js b/addons/web_editor/static/src/js/snippets.editor.js index cd03cb70f6a..51cc5a31615 100644 --- a/addons/web_editor/static/src/js/snippets.editor.js +++ b/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; }, diff --git a/addons/web_editor/static/src/xml/snippets.xml b/addons/web_editor/static/src/xml/snippets.xml index cbf1e6bef70..3fa6216c7f9 100644 --- a/addons/web_editor/static/src/xml/snippets.xml +++ b/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> |