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

Merge "Select the correct annotation in MWLinkTargetInputWidget"

Browse source
This commit is contained in:
jenkins-bot 2014-08-22 00:15:31 +00:00 committed by Gerrit Code Review
parent 0755c16e85 c446a164b1
commit 989b7ab684
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
View file

@ -27,6 +27,7 @@ ve.ui.MWLinkTargetInputWidget = function VeUiMWLinkTargetInputWidget( config ) {
// Properties
this.annotation = null;
this.choosing = false;
// Events
this.lookupMenu.connect( this, { 'choose': 'onLookupMenuItemChoose' } );
@ -58,13 +59,28 @@ OO.mixinClass( ve.ui.MWLinkTargetInputWidget, OO.ui.LookupInputWidget );
*/
ve.ui.MWLinkTargetInputWidget.prototype.onLookupMenuItemChoose = function ( item ) {
if ( item ) {
// WARNING: This assumes that #setAnnotation will emit `change` events synchronously
// TODO: Consider how this trick can be solved better, and possibly pushed upstream to
// OO.ui.LookupInputWidget so others don't fall into this trap
this.choosing = true;
this.setAnnotation( item.getData() );
this.choosing = false;
} else if ( this.annotation ) {
this.annotation = null;
this.emit( 'change', this.getValue() );
}
};
/**
* @inheritdoc
*/
ve.ui.MWLinkTargetInputWidget.prototype.onLookupInputChange = function () {
// WARNING: See #onLookupMenuItemChoose for why this is fragile
if ( !this.choosing ) {
this.openLookupMenu();
}
};
/**
* @inheritdoc
*/
@ -237,8 +253,15 @@ ve.ui.MWLinkTargetInputWidget.prototype.getLookupMenuItemsFromData = function (
ve.ui.MWLinkTargetInputWidget.prototype.initializeLookupMenuSelection = function () {
var item;
// Parent method
OO.ui.LookupInputWidget.prototype.initializeLookupMenuSelection.call( this );
if ( this.annotation ) {
this.lookupMenu.selectItem( this.lookupMenu.getItemFromData( this.annotation ) );
}
item = this.lookupMenu.getSelectedItem();
if ( !item ) {
// Parent method
OO.ui.LookupInputWidget.prototype.initializeLookupMenuSelection.call( this );
}
// Update annotation to match selected item
item = this.lookupMenu.getSelectedItem();