From 5a1da4dbaa9322d364fc4432ecc4eaaf8504d2b5 Mon Sep 17 00:00:00 2001
From: petarpetkovic <ppetkovic@wikimedia.org>
Date: Fri, 24 Aug 2018 20:46:59 +0200
Subject: [PATCH] Remove jQuery.inArray usages

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

Change-Id: I0031f0385e440a34846334d158425182542a9ac9
---
 resources/js/ext.uls.compactlinks.js    |  2 +-
 resources/js/ext.uls.displaysettings.js |  2 +-
 resources/js/ext.uls.ime.js             |  6 +++---
 resources/js/ext.uls.inputsettings.js   | 10 +++++-----
 resources/js/ext.uls.webfonts.js        |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/resources/js/ext.uls.compactlinks.js b/resources/js/ext.uls.compactlinks.js
index 56d15bd4..018eecce 100644
--- a/resources/js/ext.uls.compactlinks.js
+++ b/resources/js/ext.uls.compactlinks.js
@@ -420,7 +420,7 @@
 
 		$( '#mw-content-text [lang]' ).each( function ( i, el ) {
 			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 );
 			}
 		} );
diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js
index 96d5b5c1..557c4773 100644
--- a/resources/js/ext.uls.displaysettings.js
+++ b/resources/js/ext.uls.displaysettings.js
@@ -232,7 +232,7 @@
 
 			for ( lang in suggestedLanguages ) {
 				// Skip already found languages
-				if ( $.inArray( suggestedLanguages[ lang ], languagesForButtons ) > -1 ) {
+				if ( languagesForButtons.indexOf( suggestedLanguages[ lang ] ) > -1 ) {
 					continue;
 				}
 
diff --git a/resources/js/ext.uls.ime.js b/resources/js/ext.uls.ime.js
index ce4c72be..7e1f7480 100644
--- a/resources/js/ext.uls.ime.js
+++ b/resources/js/ext.uls.ime.js
@@ -51,9 +51,9 @@
 		previousIMELanguages = $.ime.preferences.getPreviousLanguages() || [];
 		imeLanguageList = previousIMELanguages.concat( mw.uls.getFrequentLanguageList() );
 
-		$.each( imeLanguageList, function ( i, v ) {
-			if ( $.inArray( v, unique ) === -1 ) {
-				unique.push( v );
+		imeLanguageList.forEach( function ( lang ) {
+			if ( unique.indexOf( lang ) === -1 ) {
+				unique.push( lang );
 			}
 		} );
 
diff --git a/resources/js/ext.uls.inputsettings.js b/resources/js/ext.uls.inputsettings.js
index da531bef..6c4aab47 100644
--- a/resources/js/ext.uls.inputsettings.js
+++ b/resources/js/ext.uls.inputsettings.js
@@ -242,23 +242,23 @@
 			// after selecting a different language
 			$languages.empty();
 
-			// Selected IME language may be different, and it must
-			// be present, too
+			// Selected IME language may be different, and it must be present, too
 			if ( $.uls.data.languages[ selectedImeLanguage ] &&
-				$.inArray( selectedImeLanguage, languagesForButtons ) === -1 ) {
+				languagesForButtons.indexOf( selectedImeLanguage ) === -1
+			) {
 				languagesForButtons.push( selectedImeLanguage );
 			}
 
 			// UI language must always be present
 			if ( this.uiLanguage !== this.contentLanguage &&
 				$.uls.data.languages[ this.uiLanguage ] &&
-				$.inArray( this.uiLanguage, languagesForButtons ) === -1 ) {
+				languagesForButtons.indexOf( this.uiLanguage ) === -1 ) {
 				languagesForButtons.push( this.uiLanguage );
 			}
 
 			for ( lang in suggestedLanguages ) {
 				// Skip already found languages
-				if ( $.inArray( suggestedLanguages[ lang ], languagesForButtons ) > -1 ) {
+				if ( languagesForButtons.indexOf( suggestedLanguages[ lang ] ) > -1 ) {
 					continue;
 				}
 
diff --git a/resources/js/ext.uls.webfonts.js b/resources/js/ext.uls.webfonts.js
index b536ee80..1b354142 100644
--- a/resources/js/ext.uls.webfonts.js
+++ b/resources/js/ext.uls.webfonts.js
@@ -91,7 +91,7 @@
 
 				defaultFont = repository.defaultFont( language );
 
-				if ( classes && $.inArray( 'autonym', classes ) >= 0 ) {
+				if ( classes && classes.indexOf( 'autonym' ) >= 0 ) {
 					// Do not load font for showing autonym.
 					return null;
 				}