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 "Make metadata reaping handle replacement operations more sanely"

Browse source
This commit is contained in:
jenkins-bot 2013-03-15 13:03:23 +00:00 committed by Gerrit Code Review
parent 9e1f517e9d 031b96dd2a
commit 7cd0888b3a
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/ve/dm/ve.dm.Document.js
View file

@ -533,10 +533,14 @@ ve.dm.Document.prototype.getLength = function () {
* @param insert
*/
ve.dm.Document.prototype.spliceData = function ( offset, remove, insert ) {
var spliced, reaped, reapedFlat, i;
var spliced, retain, reaped, reapedFlat, i;
insert = insert || [];
spliced = ve.batchSplice( this.data, offset, remove, insert );
reaped = ve.batchSplice( this.metadata, offset, remove, new Array( insert.length ) );
// If we're both inserting and removing in the same operation, don't remove a bunch of metadata
// elements only to insert a bunch of new ones. Instead, only add or remove as many as the length
// delta.
retain = insert.length < remove ? insert.length : remove;
reaped = ve.batchSplice( this.metadata, offset + retain, remove - retain, new Array( insert.length - retain ) );
// reaped will be an array of arrays, flatten it
reapedFlat = [];
for ( i = 0; i < reaped.length; i++ ) {
@ -548,7 +552,7 @@ ve.dm.Document.prototype.spliceData = function ( offset, remove, insert ) {
// after the removed data). Add it to the front, because it came from something that was
// before it.
if ( reapedFlat.length > 0 ) {
this.metadata[offset] = reapedFlat.concat( this.metadata[offset] || [] );
this.metadata[offset + retain] = reapedFlat.concat( this.metadata[offset] || [] );
}
return spliced;
};