jenkins-bot has submitted this change and it was merged.
Change subject: Remove listeners from deprecated search widget 'select' events
......................................................................
Remove listeners from deprecated search widget 'select' events
Attach listeners to search *result* widget 'choose' events instead.
Also, pass reference model as 'data' to MWReferenceResultWidget, instead
of index so we don't have to do a lookup later.
Change-Id: I8a9b7ddaa70e29406726ac8463582a8bcf813128
---
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
M modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js
2 files changed, 12 insertions(+), 42 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index b499264..fd28bc8 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -175,19 +175,19 @@
};
/**
- * Handle search select events.
+ * Handle search results choose events.
*
- * @param {ve.dm.MWReferenceModel|null} ref Reference model or null if no item
is selected
+ * @param {ve.ui.MWReferenceResultWidget} item Chosen item
*/
-ve.ui.MWReferenceDialog.prototype.onSearchSelect = function ( ref ) {
- if ( ref instanceof ve.dm.MWReferenceModel ) {
- if ( this.selectedNode instanceof ve.dm.MWReferenceNode ) {
- this.getFragment().removeContent();
- this.selectedNode = null;
- }
- this.useReference( ref );
- this.executeAction( 'insert' );
+ve.ui.MWReferenceDialog.prototype.onSearchResultsChoose = function ( item ) {
+ var ref = item.getData();
+
+ if ( this.selectedNode instanceof ve.dm.MWReferenceNode ) {
+ this.getFragment().removeContent();
+ this.selectedNode = null;
}
+ this.useReference( ref );
+ this.executeAction( 'insert' );
};
/**
@@ -314,7 +314,7 @@
this.search = new ve.ui.MWReferenceSearchWidget();
// Events
- this.search.connect( this, { select: 'onSearchSelect' } );
+ this.search.getResults().connect( this, { choose:
'onSearchResultsChoose' } );
// Initialization
this.panels.addItems( [ this.editPanel, this.searchPanel ] );
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js
index 78a01ef..f70c396 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js
@@ -36,13 +36,6 @@
OO.inheritClass( ve.ui.MWReferenceSearchWidget, OO.ui.SearchWidget );
-/* Events */
-
-/**
- * @event select
- * @param {ve.dm.MWReferenceModel|null} data Reference model, null if no item
is selected
- */
-
/* Methods */
/**
@@ -57,29 +50,6 @@
// Populate
this.addResults();
-};
-
-/**
- * Handle select widget select events.
- *
- * @method
- * @param {OO.ui.OptionWidget} item Selected item
- * @fires select
- */
-ve.ui.MWReferenceSearchWidget.prototype.onResultsSelect = function ( item ) {
- var data;
-
- if ( item ) {
- data = item.getData();
- // Resolve indexed values
- if ( this.index[data] ) {
- data = this.index[data].reference;
- }
- } else {
- data = null;
- }
-
- this.emit( 'select', data );
};
/**
@@ -251,7 +221,7 @@
.text( item.name );
items.push(
new ve.ui.MWReferenceResultWidget( {
- data: i,
+ data: item.reference,
label: $citation.add( $name ).add(
item.$element )
} )
);
--
To view, visit https://gerrit.wikimedia.org/r/224402
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8a9b7ddaa70e29406726ac8463582a8bcf813128
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
