jenkins-bot has submitted this change and it was merged.
Change subject: Replace $.merge with Array::concat
......................................................................
Replace $.merge with Array::concat
Change-Id: Ie824fb2d8a3db00551ebd058268f42260311e663
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
M repo/resources/wikibase.ui.entityViewInit.js
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
index fb09eb7..acdf36f 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
@@ -398,7 +398,7 @@
var deferred = $.Deferred();
if( self._cache[searchTerm] ) {
- $.merge( self._cache[searchTerm].suggestions,
suggestions );
+ self._cache[searchTerm].suggestions =
self._cache[searchTerm].suggestions.concat( suggestions );
self._cache[searchTerm].nextSuggestionOffset =
nextSuggestionOffset;
} else {
self._cache = {};
diff --git a/repo/resources/wikibase.ui.entityViewInit.js
b/repo/resources/wikibase.ui.entityViewInit.js
index d7aa2bd..edb7ebc 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -160,12 +160,12 @@
function getUserLanguages() {
var userLanguages = mw.config.get( 'wbUserSpecifiedLanguages' ),
isUlsDefined = mw.uls && $.uls && $.uls.data,
- languages = [];
+ languages;
if( !userLanguages.length && isUlsDefined ) {
languages = mw.uls.getFrequentLanguageList().slice( 1,
4 );
} else {
- languages = $.merge( [], userLanguages );
+ languages = userLanguages.slice();
languages.splice( $.inArray( mw.config.get(
'wgUserLanguage' ), userLanguages ), 1 );
}
--
To view, visit https://gerrit.wikimedia.org/r/183238
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie824fb2d8a3db00551ebd058268f42260311e663
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
