wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix selectNodes() bug reported by Inez"

Browse source
This commit is contained in:
Trevor Parscal 2012-10-17 23:24:43 +00:00 committed by Gerrit Code Review
parent 4b1b63d357 937607893c
commit 7ee5245a2d
2 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
modules/ve/test/ve.example.js
View file

@ -413,6 +413,34 @@ ve.example.getSelectNodesCases = function ( doc ) {
}
],
'msg': 'range covering a list closing and a list opening'
},
{
'actual': doc.selectNodes( new ve.Range( 39, 39 ), 'leaves' ),
'expected': [
// preformatted/text
{
'node': lookup( documentNode, 2, 0 ),
'range': new ve.Range( 39, 39 ),
'index': 0,
'nodeRange': new ve.Range( 38, 39 ),
'nodeOuterRange': new ve.Range( 38, 39 )
}
],
'msg': 'zero-length range in text node before inline node'
},
{
'actual': doc.selectNodes( new ve.Range( 41, 41 ), 'leaves' ),
'expected': [
// preformatted/text
{
'node': lookup( documentNode, 2, 2 ),
'range': new ve.Range( 41, 41 ),
'index': 2,
'nodeRange': new ve.Range( 41, 42 ),
'nodeOuterRange': new ve.Range( 41, 42 )
}
],
'msg': 'zero-length range in text node after inline node'
}
];
};

14
modules/ve/ve.Document.js
View file

@ -120,10 +120,14 @@ ve.Document.prototype.selectNodes = function ( range, mode ) {
endInside = end >= left && end <= right;
// Does the node have wrapping elements around it
isWrapped = node.isWrapped();
// Is the start between prevNode and node or between the parent's opening and node?
startBetween = isWrapped ? start === left - 1 : start === left;
// Is the end between node and nextNode or between node and the parent's closing?
endBetween = isWrapped ? end === right + 1 : end === right;
// Is there an unwrapped node right before this node?
isPrevUnwrapped = prevNode ? !prevNode.isWrapped() : false;
// Is there an unwrapped node right after this node?
isNextUnwrapped = nextNode ? !nextNode.isWrapped() : false;
// Is the start between prevNode's closing and node or between the parent's opening and node?
startBetween = ( isWrapped ? start === left - 1 : start === left ) && !isPrevUnwrapped;
// Is the end between node and nextNode's opening or between node and the parent's closing?
endBetween = ( isWrapped ? end === right + 1 : end === right ) && !isNextUnwrapped;
if ( isWrapped && end === left - 1 && currentFrame.index === 0 ) {
// The selection ends here with an empty range at the beginning of the node
@ -148,7 +152,7 @@ ve.Document.prototype.selectNodes = function ( range, mode ) {
return retval;
}
if ( start === end && ( startBetween || endBetween ) && node.isWrapped() ) {
if ( start === end && ( startBetween || endBetween ) && isWrapped ) {
// Empty range in the parent, outside of any child
nodeRange = new ve.Range( currentFrame.startOffset,
currentFrame.startOffset + currentFrame.node.getLength()