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

Merge "Check for past/future state in undo/redo before setting breakpoint"

Browse source
This commit is contained in:
jenkins-bot 2013-08-16 02:44:45 +00:00 committed by Gerrit Code Review
parent 916d1c2b69 5bff162bff
commit 27c0866d8a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -232,7 +232,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;
return this.bigStack.length - this.undoIndex > 0 || !!this.smallStack.length;
};
/**
@ -442,7 +442,7 @@ ve.dm.Surface.prototype.breakpoint = function ( selection ) {
* @returns {ve.Range} Selection or null if no further state could be reached
*/
ve.dm.Surface.prototype.undo = function () {
if ( !this.enabled ) {
if ( !this.enabled || !this.hasPastState() ) {
return;
}
var item, i, transaction, selection;
@ -477,13 +477,13 @@ ve.dm.Surface.prototype.undo = function () {
* @returns {ve.Range} Selection or null if no further state could be reached
*/
ve.dm.Surface.prototype.redo = function () {
if ( !this.enabled ) {
if ( !this.enabled || !this.hasFutureState() ) {
return;
}
var item, i, transaction, selection;
this.breakpoint();
if ( this.undoIndex > 0 && this.bigStack[this.bigStack.length - this.undoIndex] ) {
if ( this.bigStack[this.bigStack.length - this.undoIndex] ) {
this.emit( 'lock' );
item = this.bigStack[this.bigStack.length - this.undoIndex];
selection = item.selection;