pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website editor: can't select a picture followed by a br tag

Browse Source
This commit is contained in:
Christophe Matthieu
2015-01-23 12:14:15 +01:00
parent 493abe1cab
commit 60efc27f15
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/lib/summernote/src/js/core/range.js
+8 -2
View File
@@ -417,12 +417,18 @@ define([
var endPoint = {node: ec.childNodes.length && ec.childNodes[eo] || ec};
endPoint.offset = endPoint.node === ec ? eo : 0;
if (dom.isImg(startPoint.node)) {
nb ++;
image = startPoint.node;
}
dom.walkPoint(startPoint, endPoint, function (point) {
if (!dom.isText(endPoint.node) && point.node === endPoint.node && point.offset === endPoint.offset) {
return;
}
var node = point.node.childNodes.length && point.node.childNodes[point.offset] || point.node;
var offset = node === point.node ? point.offset : 0;
var isImg = dom.ancestor(node, dom.isImg);
if (!isImg && (node.nodeType !== 3 || (offset && node.textContent.length !== offset && node.textContent.match(/\S|\u00A0/)))) {
if (!isImg && ((!dom.isBR(node) && !dom.isText(node)) || (offset && node.textContent.length !== offset && node.textContent.match(/\S|\u00A0/)))) {
nb++;
}
if (isImg && image !== isImg) {