Trevor Parscal has uploaded a new change for review.
https://gerrit.wikimedia.org/r/124382
Change subject: Additional initializeSelection methodicde
......................................................................
Additional initializeSelection methodicde
Changes:
* Change uses of initializeSelection to selectItem
* Use "choose" event to respond to deliberate item selection by the user
Depends on changes in OOJS-UI (Ib3826ed)
Change-Id: Ia167a70ca5f40b1f15adad30620fdb13ef0d02d7
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
4 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/82/124382/1
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
index e68bac9..800f058 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
@@ -495,7 +495,7 @@
if ( !checked ) {
// If unchecked, remove selection
- this.positionInput.initializeSelection();
+ this.positionInput.selectItem( null );
} else {
// If checked, choose default position
if ( this.surface.getView().getDir() === 'ltr' ) {
@@ -664,7 +664,7 @@
) {
this.positionCheckbox.setValue( false );
this.positionInput.setDisabled( true );
- this.positionInput.initializeSelection();
+ this.positionInput.selectItem( null );
} else {
this.positionCheckbox.setValue( true );
this.positionInput.setDisabled( false );
@@ -692,7 +692,7 @@
this.borderCheckbox.setValue( !!this.mediaNode.getAttribute(
'borderImage' ) );
// Set image type
- this.typeInput.initializeSelection();
+ this.typeInput.selectItem( null );
if ( this.mediaNode.getAttribute( 'type' ) !== undefined ) {
this.typeInput.selectItem(
this.typeInput.getItemFromData(
this.mediaNode.getAttribute( 'type' ) )
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
index 9d4d52e..ab69a24 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
@@ -40,7 +40,7 @@
// Events
this.input.$input.on( 'keydown', ve.bind( this.onLookupInputKeyDown,
this ) );
- this.input.lookupMenu.connect( this, { 'select':
'onLookupMenuItemSelect' } );
+ this.input.lookupMenu.connect( this, { 'choose':
'onLookupMenuItemChoose' } );
this.popup.connect( this, {
'removeCategory': 'onRemoveCategory',
'updateSortkey': 'onUpdateSortkey',
@@ -105,7 +105,7 @@
* @method
* @param {OO.ui.MenuItemWidget} item Selected item
*/
-ve.ui.MWCategoryWidget.prototype.onLookupMenuItemSelect = function ( item ) {
+ve.ui.MWCategoryWidget.prototype.onLookupMenuItemChoose = function ( item ) {
var categoryItem,
value = item && item.getData(),
categoryWidget = this;
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
index e2e3d3d..0b2fcd5 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
@@ -28,7 +28,7 @@
OO.ui.LookupInputWidget.call( this, this, config );
// Events
- this.lookupMenu.connect( this, { 'select': 'onLookupMenuItemSelect' } );
+ this.lookupMenu.connect( this, { 'choose': 'onLookupMenuItemChoose' } );
// Initialization
this.$element.addClass( 've-ui-mwLinkTargetInputWidget' );
@@ -54,7 +54,7 @@
* @method
* @param {OO.ui.MenuItemWidget|null} item Selected item
*/
-ve.ui.MWLinkTargetInputWidget.prototype.onLookupMenuItemSelect = function (
item ) {
+ve.ui.MWLinkTargetInputWidget.prototype.onLookupMenuItemChoose = function (
item ) {
if ( item ) {
this.setAnnotation( item.getData() );
} else if ( this.annotation ) {
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
index 759a399..6c3f973 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
@@ -32,7 +32,7 @@
this.namespace = config.namespace || null;
// Events
- this.lookupMenu.connect( this, { 'select': 'onLookupMenuItemSelect' } );
+ this.lookupMenu.connect( this, { 'choose': 'onLookupMenuItemChoose' } );
// Initialization
this.$element.addClass( 've-ui-mwTitleInputWidget' );
@@ -53,7 +53,7 @@
* @method
* @param {OO.ui.MenuItemWidget} item Selected item
*/
-ve.ui.MWTitleInputWidget.prototype.onLookupMenuItemSelect = function ( item ) {
+ve.ui.MWTitleInputWidget.prototype.onLookupMenuItemChoose = function ( item ) {
if ( item ) {
this.setValue( item.getData() );
}
--
To view, visit https://gerrit.wikimedia.org/r/124382
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia167a70ca5f40b1f15adad30620fdb13ef0d02d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
