Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79049
Change subject: Check for past/future state in undo/redo before setting
breakpoint
......................................................................
Check for past/future state in undo/redo before setting breakpoint
This isn't a problem when using the UI buttons as they get disabled
but the command keys can still trigger these methods.
Bug: 52113
Change-Id: Idbd34953c805620881a609409290256462af80a5
---
M modules/ve/dm/ve.dm.Surface.js
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/49/79049/1
diff --git a/modules/ve/dm/ve.dm.Surface.js b/modules/ve/dm/ve.dm.Surface.js
index 20c6cf7..fc2f043 100644
--- a/modules/ve/dm/ve.dm.Surface.js
+++ b/modules/ve/dm/ve.dm.Surface.js
@@ -442,7 +442,7 @@
* @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 @@
* @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;
--
To view, visit https://gerrit.wikimedia.org/r/79049
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbd34953c805620881a609409290256462af80a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
