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

Revert "Simplify by using native JavaScript instead of jQuery"

Browse Source 
This reverts commit 0fbdbc2c41.

Bug: T203750
Change-Id: I1bca27b2087f6fc1bfad153f17f4650c52786a7f
This commit is contained in:
Amire80
2018-09-07 08:13:20 +00:00
committed by jenkins-bot
parent 445087e5fe
commit 635cada69b
4 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -210,12 +210,14 @@
* @param {jQuery} $trigger Element to use as trigger. * @param {jQuery} $trigger Element to use as trigger.
*/ */
CompactInterlanguageList.prototype.createSelector = function ( $trigger ) { CompactInterlanguageList.prototype.createSelector = function ( $trigger ) {
var languages = Object.keys( this.interlanguageList ), var languages,
self = this, self = this,
ulsLanguageList = {}; ulsLanguageList = {};
languages.forEach( function ( languageCode ) { languages = $.map( this.interlanguageList, function ( language, languageCode ) {
ulsLanguageList[ languageCode ] = this.interlanguageList[ languageCode ].autonym; ulsLanguageList[ languageCode ] = language.autonym;
return languageCode;
} ); } );
// Attach ULS to the trigger // Attach ULS to the trigger
@@ -327,7 +329,9 @@
var language, languages, compactLanguages, i, var language, languages, compactLanguages, i,
compactedList = {}; compactedList = {};
languages = Object.keys( this.interlanguageList ); languages = $.map( this.interlanguageList, function ( item, languageCode ) {
return languageCode;
} );
compactLanguages = this.compact( languages ); compactLanguages = this.compact( languages );

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

@@ -456,7 +456,7 @@
// Get the saved font using the fontSelector defined in mw.webfonts.setup // Get the saved font using the fontSelector defined in mw.webfonts.setup
savedFont = this.$webfonts.getFont( language ); savedFont = this.$webfonts.getFont( language );
fonts.forEach( function ( font ) { $.each( fonts, function ( key, font ) {
var $fontOption; var $fontOption;
if ( font !== 'system' ) { if ( font !== 'system' ) {

18
resources/js/ext.uls.languagesettings.js
View File

@@ -105,14 +105,18 @@
// Get the name of all registered modules and list them in left side menu. // Get the name of all registered modules and list them in left side menu.
// Sort the modules based on id // Sort the modules based on id
modules = Object.keys( $.fn.languagesettings.modules ).sort(); modules = $.map( $.fn.languagesettings.modules, function ( element, index ) {
modules.forEach( function ( moduleName ) { return index;
if ( !defaultModule ) { } ).sort();
defaultModule = moduleName; $.each( modules, function ( index, moduleName ) {
} if ( $.fn.languagesettings.modules.hasOwnProperty( moduleName ) ) {
if ( !defaultModule ) {
defaultModule = moduleName;
}
// Call render function on the current setting module. // Call render function on the current setting module.
languageSettings.initModule( moduleName, defaultModule === moduleName ); languageSettings.initModule( moduleName, defaultModule === moduleName );
}
} ); } );
}, },

6
tests/webfonts.html
View File

@@ -40,9 +40,9 @@
$langselector = $( 'select#language' ); $langselector = $( 'select#language' );
function listFonts( fonts ) { function listFonts( fonts ) {
fonts.push( 'Sans', 'Serif' ); $.merge( fonts, [ 'Sans', 'Serif' ] );
$fontSelector.find( 'option' ).remove(); $fontSelector.find( 'option' ).remove();
fonts.forEach( function ( font ) { $.each( fonts, function ( key, font ) {
$fontSelector.append( $( "<option></option>" ) $fontSelector.append( $( "<option></option>" )
.attr( "value", font ).text( font ) ); .attr( "value", font ).text( font ) );
} ); } );
@@ -50,7 +50,7 @@
} }
listFonts( fonts ); listFonts( fonts );
languages.forEach( function ( language ) { $.each( languages, function ( lang, language ) {
$langselector.append( $( "<option></option>" ) $langselector.append( $( "<option></option>" )
.attr( 'value', language ) .attr( 'value', language )
.text( language + " - " + $.uls.data.getAutonym( language ) ) ); .text( language + " - " + $.uls.data.getAutonym( language ) ) );