summaryrefslogtreecommitdiff
path: root/addons/web_editor/static
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-04-23 14:07:12 +0200
committerChristophe Simonis <chs@odoo.com>2018-04-23 14:07:12 +0200
commit2d12ae3202ed93a12e1f8ff59bf64e82c0c98871 (patch)
treecbcbd8258076f6cda4696852a9b93ee389d50aa1 /addons/web_editor/static
parent6157750a662a4b81e6e094a161f5b12e6ceb080a (diff)
parentc9e7433c23712f41fa2a93f3ee6464eb94173608 (diff)
[MERGE] forward port branch 9.0 up to c9e7433c237
Diffstat (limited to 'addons/web_editor/static')
-rw-r--r--addons/web_editor/static/src/js/rte.summernote.js10
1 files changed, 9 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 b8f3198dae2..2f60b1333d4 100644
--- a/addons/web_editor/static/src/js/rte.summernote.js
+++ b/addons/web_editor/static/src/js/rte.summernote.js
@@ -666,7 +666,15 @@ function summernote_mousedown (event) {
}
// restore range if range lost after clicking on non-editable area
- r = range.create();
+ try {
+ r = range.create();
+ } catch (e) {
+ // If this code is running inside an iframe-editor and that the range
+ // is outside of this iframe, this will fail as the iframe does not have
+ // the permission to check the outside content this way. In that case,
+ // we simply ignore the exception as it is as if there was no range.
+ return;
+ }
var editables = $(".o_editable[contenteditable], .note-editable[contenteditable]");
var r_editable = editables.has((r||{}).sc);
if (!r_editable.closest('.note-editor').is($editable) && !r_editable.filter('.o_editable').is(editables)) {