wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-29 08:34:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix-up offset when transplanting transclusion parts"

Browse source
This commit is contained in:
jenkins-bot 2014-02-07 23:23:54 +00:00 committed by Gerrit Code Review
parent fd6fb32db2 ace27b159b
commit 01e8dac42b
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js
View file

@ -98,7 +98,7 @@ ve.dm.MWTransclusionModel.prototype.load = function ( data ) {
* @fires change
*/
ve.dm.MWTransclusionModel.prototype.process = function ( queue ) {
var i, len, item, title, index, remove;
var i, len, item, title, index, remove, existing;
for ( i = 0, len = queue.length; i < len; i++ ) {
remove = 0;
@ -111,11 +111,16 @@ ve.dm.MWTransclusionModel.prototype.process = function ( queue ) {
}
}
// Auto-remove if already existing
this.removePart( item.add );
// Use specified index
index = item.index;
// Auto-remove if already existing, preserving index
existing = ve.indexOf( item.add, this.parts );
if ( existing !== -1 ) {
this.removePart( item.add );
if ( index && index > existing ) {
index--;
}
}
// Derive index from removal if given
if ( index === undefined && item.remove ) {
index = ve.indexOf( item.remove, this.parts );