[MediaWiki-commits] [Gerrit] Avoid references to jquery.uls RL module from ext.uls.init - change (mediawiki...UniversalLanguageSelector)

2016-05-17 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Avoid references to jquery.uls RL module from ext.uls.init
..


Avoid references to jquery.uls RL module from ext.uls.init

Checks to see if language is supported can be also done using
jquery.uls.data

Bug: T135210
Change-Id: Ib6b0d31b33be10b38aba713c3c4ba5370a27a8f4
---
M resources/js/ext.uls.init.js
1 file changed, 3 insertions(+), 16 deletions(-)

Approvals:
  Nikerabbit: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index 40ef11f..6cf4eee 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -20,8 +20,6 @@
 ( function ( $, mw ) {
'use strict';
 
-   var hasOwn = Object.prototype.hasOwnProperty;
-
mw.uls = mw.uls || {};
mw.uls.previousLanguagesStorageKey = 'uls-previous-languages';
mw.uls.languageSettingsModules = [ 'ext.uls.inputsettings', 
'ext.uls.displaysettings' ];
@@ -152,21 +150,10 @@
 
// Filter out unknown and unsupported languages
unique = $.grep( unique, function ( langCode ) {
-   var target;
-
-   // If the language is already known and defined, just 
use it
-   if ( hasOwn.call( $.fn.uls.defaults.languages, langCode 
) ) {
+   // If the language is already known and defined, just 
use it.
+   // $.uls.data.getAutonym will resolve redirects if any.
+   if ( $.uls.data.getAutonym( langCode ) !== langCode ) {
return true;
-   }
-
-   // If the language is not immediately known,
-   // try to check is as a redirect
-   target = $.uls.data.isRedirect( langCode );
-
-   if ( target ) {
-   // Check that the redirect's target is known
-   // to this instance of ULS
-   return hasOwn.call( 
$.fn.uls.defaults.languages, target );
}
 
return false;

-- 
To view, visit https://gerrit.wikimedia.org/r/289145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib6b0d31b33be10b38aba713c3c4ba5370a27a8f4
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Avoid references to jquery.uls RL module from ext.uls.init - change (mediawiki...UniversalLanguageSelector)

2016-05-16 Thread Santhosh (Code Review) 
Santhosh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/289145

Change subject: Avoid references to jquery.uls RL module from ext.uls.init
..

Avoid references to jquery.uls RL module from ext.uls.init

Checks to see if language is supported can be also done using
jquery.uls.data

Bug: T135210
Change-Id: Ib6b0d31b33be10b38aba713c3c4ba5370a27a8f4
---
M resources/js/ext.uls.init.js
1 file changed, 2 insertions(+), 13 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/45/289145/1

diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index 40ef11f..df42eee 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -152,21 +152,10 @@
 
// Filter out unknown and unsupported languages
unique = $.grep( unique, function ( langCode ) {
-   var target;
-
// If the language is already known and defined, just 
use it
-   if ( hasOwn.call( $.fn.uls.defaults.languages, langCode 
) ) {
+   // $.uls.data.getAutonym will resolve redirects if any.
+   if ( $.uls.data.getAutonym( langCode ) !== langCode ) {
return true;
-   }
-
-   // If the language is not immediately known,
-   // try to check is as a redirect
-   target = $.uls.data.isRedirect( langCode );
-
-   if ( target ) {
-   // Check that the redirect's target is known
-   // to this instance of ULS
-   return hasOwn.call( 
$.fn.uls.defaults.languages, target );
}
 
return false;

-- 
To view, visit https://gerrit.wikimedia.org/r/289145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6b0d31b33be10b38aba713c3c4ba5370a27a8f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits