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

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

Browse Source
This commit is contained in:
jenkins-bot
2016-05-18 05:51:10 +00:00
committed by Gerrit Code Review
parent fed1b51006 a5034fa95f
commit e54912d2cc
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
resources/js/ext.uls.init.js
View File

@@ -20,8 +20,6 @@
( function ( $, mw ) { ( function ( $, mw ) {
'use strict'; 'use strict';
var hasOwn = Object.prototype.hasOwnProperty;
mw.uls = mw.uls || {}; mw.uls = mw.uls || {};
mw.uls.previousLanguagesStorageKey = 'uls-previous-languages'; mw.uls.previousLanguagesStorageKey = 'uls-previous-languages';
mw.uls.languageSettingsModules = [ 'ext.uls.inputsettings', 'ext.uls.displaysettings' ]; mw.uls.languageSettingsModules = [ 'ext.uls.inputsettings', 'ext.uls.displaysettings' ];
@@ -152,23 +150,12 @@
// Filter out unknown and unsupported languages // Filter out unknown and unsupported languages
unique = $.grep( unique, function ( langCode ) { unique = $.grep( unique, function ( langCode ) {
var target; // If the language is already known and defined, just use it.
// $.uls.data.getAutonym will resolve redirects if any.
// If the language is already known and defined, just use it if ( $.uls.data.getAutonym( langCode ) !== langCode ) {
if ( hasOwn.call( $.fn.uls.defaults.languages, langCode ) ) {
return true; 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; return false;
} ); } );