summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/src/js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-01-12 17:23:10 +0100
committerChristophe Simonis <chs@odoo.com>2018-01-12 17:23:10 +0100
commit3b7bf3a4b8bc799e914fa3d6de79543823c13367 (patch)
treeb13732e56cbb2cd967e4d367aee81a9386f38555 /addons/web_editor/static/src/js
parent05fe5384feea4e0b864964ae3b6b0603e982fea3 (diff)
parent8962b8ecc2a3e7215802e06eb5c76b0a88f5380f (diff)
[MERGE] forward port branch saas-15 up to 8962b8ecc2a
Diffstat (limited to 'addons/web_editor/static/src/js')
-rw-r--r--addons/web_editor/static/src/js/rte.summernote.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/addons/web_editor/static/src/js/rte.summernote.js b/addons/web_editor/static/src/js/rte.summernote.js
index 866d0d68e84..5f28c9510bb 100644
--- a/addons/web_editor/static/src/js/rte.summernote.js
+++ b/addons/web_editor/static/src/js/rte.summernote.js
@@ -398,7 +398,9 @@ eventHandler.modules.imageDialog.showImageDialog = function ($editable) {
if (r.sc.tagName && r.sc.childNodes.length) {
r.sc = r.sc.childNodes[r.so];
}
- new widgets.MediaDialog(null, {}, $editable, dom.isImg(r.sc) ? r.sc : null).open();
+ new widgets.MediaDialog(null, {}, $editable, $(r.sc).parents().addBack().filter(function (i, el) {
+ return dom.isImg(el);
+ })[0]).open();
return new $.Deferred().reject();
};
$.summernote.pluginEvents.alt = function (event, editor, layoutInfo, sorted) {