summaryrefslogtreecommitdiff
path: root/addons/website/static/src/js/website.editor.js
diff options
context:
space:
mode:
authorChristophe Matthieu <chm@odoo.com>2015-01-07 12:54:13 +0100
committerChristophe Matthieu <chm@odoo.com>2015-01-08 11:01:42 +0100
commit95d50c2f73e87ce7337506e1470fbe05f17165d7 (patch)
tree268bd1759dd3d21f9657143ac16a479d4c4cbb36 /addons/website/static/src/js/website.editor.js
parent0b5e1a5ddd0adac7b1bc543126101185a1684f96 (diff)
[FIX] website editor: temporary fix because summernote have a wrong bookmark for history
Diffstat (limited to 'addons/website/static/src/js/website.editor.js')
-rw-r--r--addons/website/static/src/js/website.editor.js18
1 files changed, 15 insertions, 3 deletions
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 15f64ba993b..cc80c8e1710 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -675,8 +675,13 @@ define(['summernote/summernote'], function () {
return;
}
- var r = range.createFromBookmark(oSnap.editable, oSnap.bookmark);
- r.select();
+ try {
+ var r = range.createFromBookmark(oSnap.editable, oSnap.bookmark);
+ r.select();
+ } catch(e) {
+ console.error(e);
+ return;
+ }
$(document).trigger("click");
$(".o_editable *").filter(function () {
@@ -688,6 +693,9 @@ define(['summernote/summernote'], function () {
setTimeout(function () {
var target = dom.isBR(r.sc) ? r.sc.parentNode : dom.node(r.sc);
+ if (!target) {
+ return;
+ }
var evt = document.createEvent("MouseEvents");
evt.initMouseEvent("mousedown", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, target);
target.dispatchEvent(evt);
@@ -1089,7 +1097,11 @@ define(['summernote/summernote'], function () {
rng = range.create($target[0],0);
}
if (rng) {
- rng.select();
+ try {
+ rng.select();
+ } catch (e) {
+ console.error(e);
+ }
}
$target = $(rng.sc);
$target.mousedown();