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

Merge "When cloning the InternalList, pass through properties that aren't rebuilt"

Browse source
This commit is contained in:
jenkins-bot 2013-10-03 21:51:45 +00:00 committed by Gerrit Code Review
parent 1a7a5a9948 69ad031bff
commit c98624a7be
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/ve/dm/ve.dm.InternalList.js
View file

@ -416,7 +416,12 @@ ve.dm.InternalList.prototype.sortGroupIndexes = function ( group ) {
* @returns {ve.dm.InternalList} Clone of this internal
*/
ve.dm.InternalList.prototype.clone = function ( doc ) {
return new this.constructor( doc || this.getDocument() );
var clone = new this.constructor( doc || this.getDocument() );
// Most properties don't need to be copied, because addNode() will be invoked when the new
// document tree is built. But some do need copying:
clone.nextUniqueNumber = this.nextUniqueNumber;
clone.itemHtmlQueue = ve.copy( this.itemHtmlQueue );
return clone;
};
/**

19
modules/ve/test/dm/ve.dm.InternalList.test.js
View file

@ -76,13 +76,22 @@ QUnit.test( 'convertToData', 2, function ( assert ) {
assert.deepEqual( internalList.getItemHtmlQueue(), [], 'Items html is emptied after conversion' );
} );
QUnit.test( 'clone', 2, function ( assert ) {
var doc = ve.dm.example.createExampleDocument(),
QUnit.test( 'clone', 5, function ( assert ) {
var internalListClone, internalListClone2,
doc = ve.dm.example.createExampleDocument(),
doc2 = ve.dm.example.createExampleDocument(),
internalList = doc.getInternalList(),
internalListClone = internalList.clone(),
internalListClone2 = internalList.clone( doc2 );
internalList = doc.getInternalList();
internalList.getNextUniqueNumber(); // =0
internalListClone = internalList.clone();
internalList.getNextUniqueNumber(); // =1
internalListClone2 = internalList.clone( doc2 );
internalList.getNextUniqueNumber(); // =2
assert.equal( internalListClone.getDocument(), internalList.getDocument(), 'Documents match' );
assert.equal( internalListClone2.getDocument(), doc2, 'Cloning with document parameter' );
assert.equal( internalList.getNextUniqueNumber(), 3, 'original internallist has nextUniqueNumber=3' );
assert.equal( internalListClone.getNextUniqueNumber(), 1, 'first clone has nextUniqueNumber=1' );
assert.equal( internalListClone2.getNextUniqueNumber(), 2, 'second clone has nextUniqueNumber=2' );
} );