jenkins-bot has submitted this change and it was merged.
Change subject: mw.widgets.TitleWidget: Use the Promise for the data as well
......................................................................
mw.widgets.TitleWidget: Use the Promise for the data as well
Follows-up a8eba66. Use the Promise for the data as well instead of
just as a callback to evaluate a static variable. This removes any
risk of race conditions or other misuse of the variable.
Also simplify the array creation by using map instead of pushing
in an each loop.
Change-Id: Ide1489a5139ef3b26cf0de6ca6f2e675ef32c724
---
M resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
1 file changed, 5 insertions(+), 6 deletions(-)
Approvals:
Fomafix: Looks good to me, but someone else must approve
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
index 8b02443..3d97711 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleWidget.js
@@ -6,14 +6,13 @@
*/
( function ( $, mw ) {
- var interwikiPrefixes = [],
- interwikiPrefixesPromise = new mw.Api().get( {
+ var interwikiPrefixesPromise = new mw.Api().get( {
action: 'query',
meta: 'siteinfo',
siprop: 'interwikimap'
- } ).done( function ( data ) {
- $.each( data.query.interwikimap, function ( index,
interwiki ) {
- interwikiPrefixes.push( interwiki.prefix );
+ } ).then( function ( data ) {
+ return $.map( data.query.interwikimap, function (
interwiki ) {
+ return interwiki.prefix;
} );
} );
@@ -107,7 +106,7 @@
} };
if ( mw.Title.newFromText( query ) ) {
- return interwikiPrefixesPromise.then( function () {
+ return interwikiPrefixesPromise.then( function (
interwikiPrefixes ) {
var params,
interwiki = query.substring( 0,
query.indexOf( ':' ) );
if (
--
To view, visit https://gerrit.wikimedia.org/r/279524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ide1489a5139ef3b26cf0de6ca6f2e675ef32c724
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Edokter <[email protected]>
Gerrit-Reviewer: Fomafix
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
