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

Merge "Disable save button (and Alt+S) on conflict"

Browse source
This commit is contained in:
jenkins-bot 2014-02-19 22:02:01 +00:00 committed by Gerrit Code Review
parent 0d2ea63596 03dc2927ca
commit d774a642c9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
View file

@ -137,7 +137,7 @@ ve.ui.MWSaveDialog.prototype.swapPanel = function ( panel ) {
} );
break;
case 'conflict':
this.saveButton.$element.hide();
this.saveButton.setDisabled( true ).$element.hide();
this.reviewButton.$element.hide();
this.reviewGoodButton.$element.hide();
this.resolveConflictButton.$element.show();