https://www.mediawiki.org/wiki/Special:Code/MediaWiki/103465
Revision: 103465
Author: catrope
Date: 2011-11-17 14:50:38 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
Make selectNodes() not return an empty array when encountering a zero-length
selection in a structural location (we don't do this for zero-length selections
in content locations either, and the empty array is breaking an assumption I
was making in my prepareRemoval rewrite)
Modified Paths:
--------------
trunk/extensions/VisualEditor/modules/es/bases/es.DocumentBranchNode.js
trunk/extensions/VisualEditor/tests/es/es.DocumentBranchNode.test.js
Modified:
trunk/extensions/VisualEditor/modules/es/bases/es.DocumentBranchNode.js
===================================================================
--- trunk/extensions/VisualEditor/modules/es/bases/es.DocumentBranchNode.js
2011-11-17 14:46:17 UTC (rev 103464)
+++ trunk/extensions/VisualEditor/modules/es/bases/es.DocumentBranchNode.js
2011-11-17 14:50:38 UTC (rev 103465)
@@ -325,7 +325,7 @@
if ( start == end && ( start == left - 1 || start == right + 1
) ) {
// Empty range outside of any node
- return [];
+ return [{ 'node': this, 'range': new es.Range( start,
end ), 'globalRange': new es.Range( start, end ) }];
}
startInside = start >= left && start <= right; // is the start
inside childNode?
Modified: trunk/extensions/VisualEditor/tests/es/es.DocumentBranchNode.test.js
===================================================================
--- trunk/extensions/VisualEditor/tests/es/es.DocumentBranchNode.test.js
2011-11-17 14:46:17 UTC (rev 103464)
+++ trunk/extensions/VisualEditor/tests/es/es.DocumentBranchNode.test.js
2011-11-17 14:50:38 UTC (rev 103465)
@@ -167,7 +167,7 @@
{
'node': root2,
'input': new es.Range( 0, 0 ),
- 'output': [],
+ 'output': [{ 'node': root2, 'range': new es.Range( 0, 0
), 'globalRange': new es.Range( 0, 0 ) }],
'desc': 'Zero-length range before the beginning of a
node'
},
// Test 2
@@ -272,14 +272,14 @@
{
'node': root2,
'input': new es.Range( 30, 30 ),
- 'output': [],
+ 'output': [{ 'node': root2, 'range': new es.Range( 30,
30 ), 'globalRange': new es.Range( 30, 30 ) }],
'desc': 'Zero-length range past the end of a node'
},
// Test 17
{
'node': root2,
'input': new es.Range( 20, 20 ),
- 'output': [],
+ 'output': [{ 'node': root2, 'range': new es.Range( 20,
20 ), 'globalRange': new es.Range( 20, 20 ) }],
'desc': 'Zero-length range between two nodes'
},
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
