wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-25 03:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Rename big/small stack to undoStack & newTransactions"

Browse source
This commit is contained in:
jenkins-bot 2013-12-11 02:41:28 +00:00 committed by Gerrit Code Review
parent cc65c7a704 d6ca977397
commit 286f2b1581
3 changed files with 37 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
modules/ve/dm/ve.dm.Surface.js
View file

@ -23,8 +23,8 @@ ve.dm.Surface = function VeDmSurface( doc ) {
this.metaList = new ve.dm.MetaList( this );
this.selection = new ve.Range( 1, 1 );
this.selectedNodes = {};
this.smallStack = [];
this.bigStack = [];
this.newTransactions = [];
this.undoStack = [];
this.undoIndex = 0;
this.historyTrackingInterval = null;
this.insertionAnnotations = new ve.dm.AnnotationSet( this.documentModel.getStore() );
@ -132,8 +132,8 @@ ve.dm.Surface.prototype.purgeHistory = function () {
return;
}
this.selection = new ve.Range( 0, 0 );
this.smallStack = [];
this.bigStack = [];
this.newTransactions = [];
this.undoStack = [];
this.undoIndex = 0;
};
@ -144,10 +144,10 @@ ve.dm.Surface.prototype.purgeHistory = function () {
* @returns {Object[]} List of transaction stacks
*/
ve.dm.Surface.prototype.getHistory = function () {
if ( this.smallStack.length > 0 ) {
return this.bigStack.slice( 0 ).concat( [{ 'stack': this.smallStack.slice( 0 ) }] );
if ( this.newTransactions.length > 0 ) {
return this.undoStack.slice( 0 ).concat( [{ 'transactions': this.newTransactions.slice( 0 ) }] );
} else {
return this.bigStack.slice( 0 );
return this.undoStack.slice( 0 );
}
};
@ -238,7 +238,7 @@ ve.dm.Surface.prototype.hasFutureState = function () {
* @returns {boolean} Has a past state
*/
ve.dm.Surface.prototype.hasPastState = function () {
return this.bigStack.length - this.undoIndex > 0 || !!this.smallStack.length;
return this.undoStack.length - this.undoIndex > 0 || !!this.newTransactions.length;
};
/**
@ -290,7 +290,7 @@ ve.dm.Surface.prototype.getFragment = function ( range, noAutoSelect ) {
*/
ve.dm.Surface.prototype.truncateUndoStack = function () {
if ( this.undoIndex ) {
this.bigStack = this.bigStack.slice( 0, this.bigStack.length - this.undoIndex );
this.undoStack = this.undoStack.slice( 0, this.undoStack.length - this.undoIndex );
this.undoIndex = 0;
this.emit( 'history' );
}
@ -478,7 +478,7 @@ ve.dm.Surface.prototype.changeInternal = function ( transactions, selection, ski
if ( !transactions[i].isNoOp() ) {
if ( !skipUndoStack ) {
this.truncateUndoStack();
this.smallStack.push( transactions[i] );
this.newTransactions.push( transactions[i] );
}
// The .commit() call below indirectly invokes setSelection()
this.documentModel.commit( transactions[i] );
@ -525,12 +525,12 @@ ve.dm.Surface.prototype.breakpoint = function ( selection ) {
if ( !this.enabled ) {
return false;
}
if ( this.smallStack.length > 0 ) {
this.bigStack.push( {
stack: this.smallStack,
selection: selection || this.selection.clone()
if ( this.newTransactions.length > 0 ) {
this.undoStack.push( {
'transactions': this.newTransactions,
'selection': selection || this.selection.clone()
} );
this.smallStack = [];
this.newTransactions = [];
this.emit( 'history' );
return true;
}
@ -552,12 +552,12 @@ ve.dm.Surface.prototype.undo = function () {
this.breakpoint();
this.undoIndex++;
item = this.bigStack[this.bigStack.length - this.undoIndex];
item = this.undoStack[this.undoStack.length - this.undoIndex];
if ( item ) {
// Apply reversed transactions in reversed order, and translate the selection accordingly
selection = item.selection;
for ( i = item.stack.length - 1; i >= 0; i-- ) {
transaction = item.stack[i].reversed();
for ( i = item.transactions.length - 1; i >= 0; i-- ) {
transaction = item.transactions[i].reversed();
selection = transaction.translateRange( selection );
transactions.push( transaction );
}
@ -580,10 +580,10 @@ ve.dm.Surface.prototype.redo = function () {
this.breakpoint();
item = this.bigStack[this.bigStack.length - this.undoIndex];
item = this.undoStack[this.undoStack.length - this.undoIndex];
if ( item ) {
// ve.copy( item.stack ) invokes .clone() on each transaction in item.stack
this.changeInternal( ve.copy( item.stack ), item.selection, true );
// ve.copy( item.transactions ) invokes .clone() on each transaction in item.transactions
this.changeInternal( ve.copy( item.transactions ), item.selection, true );
this.undoIndex--;
this.emit( 'history' );
}

4
modules/ve/test/ce/ve.ce.Surface.test.js
View file

@ -436,7 +436,7 @@ QUnit.test( 'onContentChange', function ( assert ) {
};
surface.getView().onContentChange( view, prev, next );
txs = surface.getModel().getHistory()[0].stack;
txs = surface.getModel().getHistory()[0].transactions;
ops = [];
for ( i = 0; i < txs.length; i++ ) {
ops.push( txs[i].getOperations() );
@ -736,7 +736,7 @@ QUnit.test( 'beforePaste/afterPaste', function ( assert ) {
}
view.afterPaste();
txs = model.getHistory()[0].stack;
txs = model.getHistory()[0].transactions;
ops = [];
for ( i = 0; i < txs.length; i++ ) {
ops.push( txs[i].getOperations() );

20
modules/ve/test/dm/ve.dm.Surface.test.js
View file

@ -64,17 +64,25 @@ QUnit.test( 'breakpoint', 7, function ( assert ) {
assert.equal( surface.breakpoint(), false, 'Returns false if no transactions applied' );
surface.change( tx, selection );
assert.deepEqual( surface.bigStack, [], 'Big stack data matches before breakpoint' );
assert.deepEqual( surface.smallStack, [tx], 'Small stack data matches before breakpoint' );
assert.deepEqual( surface.undoStack, [], 'Undo stack data matches before breakpoint' );
assert.deepEqual( surface.newTransactions, [tx], 'New transactions match before breakpoint' );
assert.equal( surface.breakpoint(), true, 'Returns true after transaction applied' );
assert.equal( surface.breakpoint(), false, 'Returns false if no transactions applied since last breakpoint' );
assert.deepEqual( surface.bigStack, [ {
'stack': [tx],
assert.deepEqual( surface.undoStack, [ {
'transactions': [tx],
'selection': selection
} ],
'Big stack data matches after breakpoint'
'Undo stack data matches after breakpoint'
);
assert.deepEqual( surface.smallStack, [], 'Small stack data matches after breakpoint' );
assert.deepEqual( surface.newTransactions, [], 'New transactions match after breakpoint' );
} );
// TODO: ve.dm.Surface#getHistory
// TODO: ve.dm.Surface#purgeHistory
// TODO: ve.dm.Surface#hasFutureState
// TODO: ve.dm.Surface#hasPastState
// TODO: ve.dm.Surface#truncateUndoStack
// TODO: ve.dm.Surface#undo
// TODO: ve.dm.Surface#redo