Disable save button (and Alt+S) on conflict

In the conflict pane, we hide the save button, so disabling it doesn't
make a visual difference, but it also disables the Alt+S access key.

Change-Id: I8c0d92a40a02d525ec10932656ebf38a74a97cd4
This commit is contained in:
Roan Kattouw 2014-02-19 13:46:43 -08:00
parent ec8234f183
commit 03dc2927ca

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();