From ebc5b3b11b0ff94113c4af0333a562ef26159072 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Mon, 9 Feb 2015 13:39:43 +0100 Subject: [PATCH] [IMP] summernote: dom.isImg is unnecessary, because isVoid function contains that. --- addons/website/static/lib/summernote/src/js/core/range.js | 2 +- addons/website/static/src/js/website.editor.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/website/static/lib/summernote/src/js/core/range.js b/addons/website/static/lib/summernote/src/js/core/range.js index 00c2affd765..ea37337f27c 100644 --- a/addons/website/static/lib/summernote/src/js/core/range.js +++ b/addons/website/static/lib/summernote/src/js/core/range.js @@ -645,7 +645,7 @@ define([ var eo = dom.nodeLength(ec); // browsers can't target a picture or void node - if (dom.isVoid(sc) || dom.isImg(sc)) { + if (dom.isVoid(sc)) { so = dom.listPrev(sc).length-1; sc = sc.parentNode; } diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 277e7598c3e..510c0be4b9d 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -402,6 +402,9 @@ define(['summernote/summernote'], function () { ////////////////////////////////////////////////////////////////////////////////////////////////////////// + dom.isVoid = function (node) { + return node && /^BR|^IMG|^HR/.test(node.nodeName.toUpperCase()) || dom.isImg(node); + }; dom.isImg = function (node) { return dom.isImgFont(node) || (node && (node.nodeName === "IMG" || (node.className && node.className.match(/(^|\s)media_iframe_video(\s|$)/i)) )); };