summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/src/js/widgets.js
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2016-09-06 14:29:40 +0200
committerqsm-odoo <qsm@odoo.com>2016-09-20 14:06:29 +0200
commit745d1e3328b0e4711d09951cd7873ca581112e49 (patch)
treeaeec10ada78dfa65bdd46adcb30f85bfff463623 /addons/web_editor/static/src/js/widgets.js
parent9a1939bbcb38db7b9537b0fb6663cad8aa9cb366 (diff)
[FIX] web_editor: adapt code which updates editor bar after image edition
This fixes a bug where the media dialog reopened after closing after edition of a t-field="image_small" block.
Diffstat (limited to 'addons/web_editor/static/src/js/widgets.js')
-rw-r--r--addons/web_editor/static/src/js/widgets.js19
1 files changed, 6 insertions, 13 deletions
diff --git a/addons/web_editor/static/src/js/widgets.js b/addons/web_editor/static/src/js/widgets.js
index a34571a3f54..985a0783ef6 100644
--- a/addons/web_editor/static/src/js/widgets.js
+++ b/addons/web_editor/static/src/js/widgets.js
@@ -200,21 +200,14 @@ var MediaDialog = Dialog.extend({
$(document.body).trigger("media-saved", [media, self.old_media]);
self.trigger("saved", [media, self.old_media]);
- setTimeout(function () {
- if (!media.parentNode) {
- return;
- }
+
+ // Update editor bar after image edition (in case the image change to icon or other)
+ _.defer(function () {
+ if (!media.parentNode) return;
range.createFromNode(media).select();
click_event(media, "mousedown");
- if (!this.only_images) {
- setTimeout(function () {
- if($(media).parent().data("oe-field") !== "image") {
- click_event(media, "click");
- }
- click_event(media, "mouseup");
- },0);
- }
- },0);
+ click_event(media, "mouseup");
+ });
this._super.apply(this, arguments);
},