jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/383088 )
Change subject: SearchInputWidget: Pass through description data
......................................................................
SearchInputWidget: Pass through description data
Also make result-parsing code clearer.
Change-Id: Ibf90ba3fc330f442606f243855721182701f7c02
---
M resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
1 file changed, 7 insertions(+), 5 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
index 8707bfa..e73f347 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
@@ -184,9 +184,12 @@
*/
mw.widgets.SearchInputWidget.prototype.getOptionsFromData = function (
data ) {
var items = [],
+ titles = data.data[ 1 ],
+ descriptions = data.data[ 2 ],
+ urls = data.data[ 3 ],
self = this;
- $.each( data.data[ 1 ], function ( i, result ) {
+ $.each( titles, function ( i, result ) {
items.push( new mw.widgets.TitleOptionWidget(
self.getOptionWidgetData(
result,
@@ -194,10 +197,9 @@
// the parent's API query.
{
data: result,
- // data[ 3 ][ i ] is the link
for this result
- url: data.data[ 3 ][ i ],
- imageUrl: null,
- description: null,
+ url: urls[ i ],
+ imageUrl: null, // The JSON
'opensearch' API doesn't have images
+ description: descriptions[ i ],
missing: false,
redirect: false,
disambiguation: false
--
To view, visit https://gerrit.wikimedia.org/r/383088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf90ba3fc330f442606f243855721182701f7c02
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
