wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-26 19:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small refactoring to getOffset method in SurfaceView

Browse source
This commit is contained in:
Inez Korczynski 2012-01-26 06:55:46 +00:00
parent b2db4c43eb
commit ffc304ef6c
Notes: Gabriel Wicke 2012-02-27 16:40:01 +00:00 
https://mediawiki.org/wiki/Special:Code/MediaWiki/110047
1 changed files with 103 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
contentEditable/views/es.SurfaceView.js
View file

@ -46,10 +46,11 @@ es.SurfaceView.prototype.getOffset = function( localNode, localOffset ) {
$node = $node.parent(); $node = $node.parent();
} }
var traverse = function( data, callback ) { var current = [$node.contents(), 0];
var current = [ data, 0 ];
var stack = [current]; var stack = [current];
var offset = 0;
while ( stack.length > 0 ) { while ( stack.length > 0 ) {
if ( current[1] >= current[0].length ) { if ( current[1] >= current[0].length ) {
stack.pop(); stack.pop();
@ -57,45 +58,30 @@ es.SurfaceView.prototype.getOffset = function( localNode, localOffset ) {
continue; continue;
} }
var item = current[0][current[1]]; var item = current[0][current[1]];
var out = callback( item ); var $item = current[0].eq( current[1] );
/*
* -1 = stop traversing if ( item.nodeType === 3 ) {
* 1 = deep traverse if ( item === localNode ) {
* 0 = skip deep traverse offset += localOffset;
*/ break;
if ( out === -1 ) { } else {
return; offset += item.textContent.length;
} else if ( out === 1 && item.nodeType === 1 ) { }
stack.push( [ $(item).contents() , 0 ] ); } else if ( item.nodeType === 1 ) {
if ( $( item ).attr('contentEditable') === "false" ) {
console.log("in");
offset += 1;
} else {
stack.push( [$item.contents(), 0] );
current[1]++; current[1]++;
current = stack[stack.length-1]; current = stack[stack.length-1];
continue; continue;
} }
}
current[1]++; current[1]++;
} }
};
var offset = 0; return this.documentView.getOffsetFromNode( $node.data('view') ) + 1 + offset;
traverse( $node.contents(), function( item ) {
if ( item.nodeType === 3 ) {
if ( item === localNode ) {
offset += localOffset;
return -1;
} else {
offset += item.textContent.length;
}
} else {
if ( $( item ).attr('contentEditable') === "false" ) {
offset += 1;
return 0;
}
}
return 1;
} );
return offset + 1 + this.documentView.getOffsetFromNode( $node.data('view') );
} }
es.SurfaceView.prototype.getSelection = function() { es.SurfaceView.prototype.getSelection = function() {