wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-26 19:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

MWReferenceDialog: Allow swapping of existing references for others

Browse source 
By disabling the selection button instead of hiding it.

Also make sure that there are other references before re-enabling it.

Bug: 65689
Change-Id: Ifb3d6ab6eacb71909eb13e3a72e971b49e2595c1
This commit is contained in:
Krenair 2014-05-31 20:09:07 +01:00 committed by Roan Kattouw
parent 390d8ca793
commit fdc3cb2710
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
View file

@ -143,7 +143,7 @@ ve.ui.MWReferenceDialog.prototype.onDocumentTransact = function () {
applyDisabled = data.countNoninternalElements() <= 2; applyDisabled = data.countNoninternalElements() <= 2;
this.applyButton.setDisabled( applyDisabled ); this.applyButton.setDisabled( applyDisabled );
this.selectButton.setDisabled( !applyDisabled ); this.selectButton.setDisabled( !applyDisabled || this.search.isIndexEmpty() );
}; };
/** /**
@ -153,6 +153,10 @@ ve.ui.MWReferenceDialog.prototype.onDocumentTransact = function () {
*/ */
ve.ui.MWReferenceDialog.prototype.onSearchSelect = function ( ref ) { ve.ui.MWReferenceDialog.prototype.onSearchSelect = function ( ref ) {
if ( ref instanceof ve.dm.MWReferenceModel ) { if ( ref instanceof ve.dm.MWReferenceModel ) {
if ( this.selectedNode instanceof ve.dm.MWReferenceNode ) {
this.getFragment().removeContent();
this.selectedNode = null;
}
this.useReference( ref ); this.useReference( ref );
// HACK - This proves that the interface for ActionDialog is screwed up // HACK - This proves that the interface for ActionDialog is screwed up
this.onApplyButtonClick(); this.onApplyButtonClick();
@ -235,6 +239,7 @@ ve.ui.MWReferenceDialog.prototype.applyChanges = function () {
} }
this.referenceModel.insertReferenceNode( surfaceFragment ); this.referenceModel.insertReferenceNode( surfaceFragment );
} }
// Update internal item // Update internal item
this.referenceModel.updateInternalItem( surfaceModel ); this.referenceModel.updateInternalItem( surfaceModel );
@ -327,20 +332,25 @@ ve.ui.MWReferenceDialog.prototype.getSetupProcess = function ( data ) {
this.useReference( this.useReference(
ve.dm.MWReferenceModel.static.newFromReferenceNode( this.selectedNode ) ve.dm.MWReferenceModel.static.newFromReferenceNode( this.selectedNode )
); );
this.selectButton.$element.hide();
} else { } else {
this.useReference( null ); this.useReference( null );
this.selectButton.$element.show();
this.applyButton.setDisabled( true ); this.applyButton.setDisabled( true );
} }
this.selectButton.$element.show();
this.applyButton.$element.show(); this.applyButton.$element.show();
this.backButton.$element.hide(); this.backButton.$element.hide();
this.search.buildIndex( this.getFragment().getDocument().getInternalList() ); this.search.buildIndex( this.getFragment().getDocument().getInternalList() );
this.selectButton.setDisabled( this.search.isIndexEmpty() );
if ( data.useExisting ) { if ( data.useExisting ) {
this.useExistingReference(); this.useExistingReference();
} }
// If we're using an existing reference, start off disabled
// If not, set disabled based on whether or not there are any existing ones.
this.selectButton.setDisabled(
this.selectedNode instanceof ve.dm.MWReferenceNode ||
this.search.isIndexEmpty()
);
}, this ); }, this );
}; };