bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove jQuery.inArray usages

Browse Source 
Replace jQuery.inArray with JS native Array.prototype.indexOf

Change-Id: I0031f0385e440a34846334d158425182542a9ac9
This commit is contained in:
petarpetkovic
2018-08-24 20:46:59 +02:00
committed by jenkins-bot
parent 54a3313e1a
commit 5a1da4dbaa
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/js/ext.uls.compactlinks.js
View File

@@ -420,7 +420,7 @@
$( '#mw-content-text [lang]' ).each( function ( i, el ) { $( '#mw-content-text [lang]' ).each( function ( i, el ) {
var lang = convertMediaWikiLanguageCodeToULS( $( el ).attr( 'lang' ) ); var lang = convertMediaWikiLanguageCodeToULS( $( el ).attr( 'lang' ) );
if ( $.inArray( lang, languagesInText ) === -1 && $.inArray( lang, languages ) >= 0 ) { if ( languagesInText.indexOf( lang ) === -1 && languages.indexOf( lang ) >= 0 ) {
languagesInText.push( lang ); languagesInText.push( lang );
} }
} ); } );

2
resources/js/ext.uls.displaysettings.js
View File

@@ -232,7 +232,7 @@
for ( lang in suggestedLanguages ) { for ( lang in suggestedLanguages ) {
// Skip already found languages // Skip already found languages
if ( $.inArray( suggestedLanguages[ lang ], languagesForButtons ) > -1 ) { if ( languagesForButtons.indexOf( suggestedLanguages[ lang ] ) > -1 ) {
continue; continue;
} }

6
resources/js/ext.uls.ime.js
View File

@@ -51,9 +51,9 @@
previousIMELanguages = $.ime.preferences.getPreviousLanguages() || []; previousIMELanguages = $.ime.preferences.getPreviousLanguages() || [];
imeLanguageList = previousIMELanguages.concat( mw.uls.getFrequentLanguageList() ); imeLanguageList = previousIMELanguages.concat( mw.uls.getFrequentLanguageList() );
$.each( imeLanguageList, function ( i, v ) { imeLanguageList.forEach( function ( lang ) {
if ( $.inArray( v, unique ) === -1 ) { if ( unique.indexOf( lang ) === -1 ) {
unique.push( v ); unique.push( lang );
} }
} ); } );

10
resources/js/ext.uls.inputsettings.js
View File

@@ -242,23 +242,23 @@
// after selecting a different language // after selecting a different language
$languages.empty(); $languages.empty();
// Selected IME language may be different, and it must // Selected IME language may be different, and it must be present, too
// be present, too
if ( $.uls.data.languages[ selectedImeLanguage ] && if ( $.uls.data.languages[ selectedImeLanguage ] &&
$.inArray( selectedImeLanguage, languagesForButtons ) === -1 ) { languagesForButtons.indexOf( selectedImeLanguage ) === -1
) {
languagesForButtons.push( selectedImeLanguage ); languagesForButtons.push( selectedImeLanguage );
} }
// UI language must always be present // UI language must always be present
if ( this.uiLanguage !== this.contentLanguage && if ( this.uiLanguage !== this.contentLanguage &&
$.uls.data.languages[ this.uiLanguage ] && $.uls.data.languages[ this.uiLanguage ] &&
$.inArray( this.uiLanguage, languagesForButtons ) === -1 ) { languagesForButtons.indexOf( this.uiLanguage ) === -1 ) {
languagesForButtons.push( this.uiLanguage ); languagesForButtons.push( this.uiLanguage );
} }
for ( lang in suggestedLanguages ) { for ( lang in suggestedLanguages ) {
// Skip already found languages // Skip already found languages
if ( $.inArray( suggestedLanguages[ lang ], languagesForButtons ) > -1 ) { if ( languagesForButtons.indexOf( suggestedLanguages[ lang ] ) > -1 ) {
continue; continue;
} }

2
resources/js/ext.uls.webfonts.js
View File

@@ -91,7 +91,7 @@
defaultFont = repository.defaultFont( language ); defaultFont = repository.defaultFont( language );
if ( classes && $.inArray( 'autonym', classes ) >= 0 ) { if ( classes && classes.indexOf( 'autonym' ) >= 0 ) {
// Do not load font for showing autonym. // Do not load font for showing autonym.
return null; return null;
} }