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

Use spaces inside of brackets in JavaScript

Browse Source 
* For consistency
* For MediaWiki coding conventions

Change-Id: I625a8ce0119b1490073f048e1b8ad4e90762d6e2
This commit is contained in:
Fomafix
2016-02-15 13:31:45 +00:00
committed by [[mw:User:Fomafix]]
parent 63bc85649a
commit c329f1473d
7 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -226,11 +226,11 @@
for ( lang in suggestedLanguages ) { for ( lang in suggestedLanguages ) {
// Skip already found languages // Skip already found languages
if ( $.inArray( suggestedLanguages[lang], languagesForButtons ) > -1 ) { if ( $.inArray( suggestedLanguages[ lang ], languagesForButtons ) > -1 ) {
continue; continue;
} }
languagesForButtons.push( suggestedLanguages[lang] ); languagesForButtons.push( suggestedLanguages[ lang ] );
// No need to add more languages than buttons // No need to add more languages than buttons
if ( languagesForButtons.length >= SUGGESTED_LANGUAGES_NUMBER ) { if ( languagesForButtons.length >= SUGGESTED_LANGUAGES_NUMBER ) {
@@ -251,7 +251,7 @@
// Add the buttons for the most likely languages // Add the buttons for the most likely languages
for ( i = 0; i < SUGGESTED_LANGUAGES_NUMBER; i++ ) { for ( i = 0; i < SUGGESTED_LANGUAGES_NUMBER; i++ ) {
language = languagesForButtons[i]; language = languagesForButtons[ i ];
$button = $( '<button>' ) $button = $( '<button>' )
.addClass( 'button uls-language-button autonym' ) .addClass( 'button uls-language-button autonym' )
.text( $.uls.data.getAutonym( language ) ) .text( $.uls.data.getAutonym( language ) )
@@ -665,15 +665,15 @@
mw.hook( webfontsEvent ).fire( 'displaysettings' ); mw.hook( webfontsEvent ).fire( 'displaysettings' );
} }
if ( newFonts[displaySettings.uiLanguage] !== oldFonts[displaySettings.uiLanguage] ) { if ( newFonts[ displaySettings.uiLanguage ] !== oldFonts[ displaySettings.uiLanguage ] ) {
mw.hook( 'mw.uls.font.change' ).fire( mw.hook( 'mw.uls.font.change' ).fire(
'interface', displaySettings.uiLanguage, newFonts[displaySettings.uiLanguage] 'interface', displaySettings.uiLanguage, newFonts[ displaySettings.uiLanguage ]
); );
} }
if ( newFonts[displaySettings.contentLanguage] !== oldFonts[displaySettings.contentLanguage] ) { if ( newFonts[ displaySettings.contentLanguage ] !== oldFonts[ displaySettings.contentLanguage ] ) {
mw.hook( 'mw.uls.font.change' ).fire( mw.hook( 'mw.uls.font.change' ).fire(
'content', displaySettings.contentLanguage, newFonts[displaySettings.contentLanguage] 'content', displaySettings.contentLanguage, newFonts[ displaySettings.contentLanguage ]
); );
} }

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

@@ -48,7 +48,7 @@
if ( messages ) { if ( messages ) {
return i18n.load( messages, locale ); return i18n.load( messages, locale );
} }
if ( i18n.messageStore.messages[locale] ) { if ( i18n.messageStore.messages[ locale ] ) {
return $.Deferred().resolve(); return $.Deferred().resolve();
} }
return i18n.messageStore.load( return i18n.messageStore.load(

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

@@ -35,7 +35,7 @@
availableLanguages = {}; availableLanguages = {};
for ( language in $.ime.languages ) { for ( language in $.ime.languages ) {
availableLanguages[language] = ulsLanguages[language]; availableLanguages[ language ] = ulsLanguages[ language ];
} }
return availableLanguages; return availableLanguages;

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

@@ -114,7 +114,7 @@
var index, inputSettings, $imeListContainer, defaultInputmethod, var index, inputSettings, $imeListContainer, defaultInputmethod,
imes, selected, imeId, $imeListTitle; imes, selected, imeId, $imeListTitle;
imes = $.ime.languages[language]; imes = $.ime.languages[ language ];
$imeListTitle = this.$template.find( '.ext-uls-input-settings-imes-title' ); $imeListTitle = this.$template.find( '.ext-uls-input-settings-imes-title' );
$imeListContainer = this.$template.find( '.uls-input-settings-inputmethods-list' ); $imeListContainer = this.$template.find( '.uls-input-settings-inputmethods-list' );
@@ -134,10 +134,10 @@
inputSettings = this; inputSettings = this;
defaultInputmethod = $.ime.preferences.getIM( language ) || imes.inputmethods[0]; defaultInputmethod = $.ime.preferences.getIM( language ) || imes.inputmethods[ 0 ];
for ( index in imes.inputmethods ) { for ( index in imes.inputmethods ) {
imeId = imes.inputmethods[index]; imeId = imes.inputmethods[ index ];
selected = defaultInputmethod === imeId; selected = defaultInputmethod === imeId;
$imeListContainer.append( inputSettings.renderInputmethodOption( imeId, $imeListContainer.append( inputSettings.renderInputmethodOption( imeId,
selected ) ); selected ) );
@@ -161,7 +161,7 @@
renderInputmethodOption: function ( imeId, selected ) { renderInputmethodOption: function ( imeId, selected ) {
var $imeLabel, name, description, $helplink, inputmethod, $inputMethodItem; var $imeLabel, name, description, $helplink, inputmethod, $inputMethodItem;
if ( imeId !== 'system' && !$.ime.sources[imeId] ) { if ( imeId !== 'system' && !$.ime.sources[ imeId ] ) {
// imeId not known for jquery.ime. // imeId not known for jquery.ime.
// It is very rare, but still validate it. // It is very rare, but still validate it.
return $(); return $();
@@ -186,7 +186,7 @@
description = ''; description = '';
$helplink = ''; $helplink = '';
} else { } else {
inputmethod = $.ime.inputmethods[imeId]; inputmethod = $.ime.inputmethods[ imeId ];
$helplink = $( '<a>' ) $helplink = $( '<a>' )
.addClass( 'uls-ime-help' ) .addClass( 'uls-ime-help' )
.text( $.i18n( 'ext-uls-ime-help' ) ) .text( $.i18n( 'ext-uls-ime-help' ) )
@@ -195,11 +195,11 @@
if ( !inputmethod ) { if ( !inputmethod ) {
// The input method definition(rules) not loaded. // The input method definition(rules) not loaded.
// We will show the name from $.ime.sources // We will show the name from $.ime.sources
name = $.ime.sources[imeId].name; name = $.ime.sources[ imeId ].name;
description = ''; description = '';
} else { } else {
name = inputmethod.name; name = inputmethod.name;
description = $.ime.inputmethods[imeId].description; description = $.ime.inputmethods[ imeId ].description;
} }
} }
@@ -239,25 +239,25 @@
// 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 ) { $.inArray( selectedImeLanguage, languagesForButtons ) === -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 ) { $.inArray( this.uiLanguage, languagesForButtons ) === -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 ( $.inArray( suggestedLanguages[ lang ], languagesForButtons ) > -1 ) {
continue; continue;
} }
languagesForButtons.push( suggestedLanguages[lang] ); languagesForButtons.push( suggestedLanguages[ lang ] );
// No need to add more languages than buttons // No need to add more languages than buttons
if ( languagesForButtons.length >= SUGGESTED_LANGUAGES_NUMBER ) { if ( languagesForButtons.length >= SUGGESTED_LANGUAGES_NUMBER ) {
@@ -284,7 +284,7 @@
selectedImeLanguage = selectedImeLanguage || this.contentLanguage; selectedImeLanguage = selectedImeLanguage || this.contentLanguage;
// Add the buttons for the most likely languages // Add the buttons for the most likely languages
for ( i = 0; i < SUGGESTED_LANGUAGES_NUMBER; i++ ) { for ( i = 0; i < SUGGESTED_LANGUAGES_NUMBER; i++ ) {
language = languagesForButtons[i]; language = languagesForButtons[ i ];
$button = $( '<button>' ) $button = $( '<button>' )
.addClass( 'button uls-language-button autonym' ) .addClass( 'button uls-language-button autonym' )
.text( $.uls.data.getAutonym( language ) ) .text( $.uls.data.getAutonym( language ) )
@@ -515,7 +515,7 @@
inputSettings.$parent.setBusy( true ); inputSettings.$parent.setBusy( true );
if ( previousLanguage ) { if ( previousLanguage ) {
previousIM = inputSettings.savedRegistry.imes[previousLanguage]; previousIM = inputSettings.savedRegistry.imes[ previousLanguage ];
} }
if ( currentLanguage !== inputSettings.savedRegistry.language || if ( currentLanguage !== inputSettings.savedRegistry.language ||

4
resources/js/ext.uls.interface.js
View File

@@ -255,7 +255,7 @@
} }
previousLanguages = mw.uls.getPreviousLanguages(); previousLanguages = mw.uls.getPreviousLanguages();
previousLang = previousLanguages.slice( -1 )[0]; previousLang = previousLanguages.slice( -1 )[ 0 ];
previousLanguages.push( currentLang ); previousLanguages.push( currentLang );
mw.uls.setPreviousLanguages( previousLanguages ); mw.uls.setPreviousLanguages( previousLanguages );
@@ -263,7 +263,7 @@
getUndoAutonym( previousLang ).done( function( autonym ) { getUndoAutonym( previousLang ).done( function( autonym ) {
// Attach a tipsy tooltip to the trigger // Attach a tipsy tooltip to the trigger
$ulsTrigger.tipsy( { $ulsTrigger.tipsy( {
gravity: tipsyGravity[ulsPosition], gravity: tipsyGravity[ ulsPosition ],
delayOut: 3000, delayOut: 3000,
html: true, html: true,
fade: true, fade: true,

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

@@ -119,7 +119,7 @@
initModule: function ( moduleName, active ) { initModule: function ( moduleName, active ) {
var $settingsTitle, $settingsText, $settingsLink, var $settingsTitle, $settingsText, $settingsLink,
languageSettings = this, languageSettings = this,
module = new $.fn.languagesettings.modules[moduleName]( languageSettings ), module = new $.fn.languagesettings.modules[ moduleName ]( languageSettings ),
$settingsMenuItems = languageSettings.$window.find( '.settings-menu-items' ); $settingsMenuItems = languageSettings.$window.find( '.settings-menu-items' );
$settingsTitle = $( '<div>' ) $settingsTitle = $( '<div>' )
@@ -153,7 +153,7 @@
module.render(); module.render();
$settingsLink.addClass( 'active' ); $settingsLink.addClass( 'active' );
} }
this.modules[moduleName] = module; this.modules[ moduleName ] = module;
// Register cancel and apply hooks // Register cancel and apply hooks
mw.hook( 'mw.uls.settings.cancel' ).add( $.proxy( module.cancel, module ) ); mw.hook( 'mw.uls.settings.cancel' ).add( $.proxy( module.cancel, module ) );
@@ -165,7 +165,7 @@
languageSettings = this; languageSettings = this;
pos = $.extend( {}, this.$element.offset(), { pos = $.extend( {}, this.$element.offset(), {
height: this.$element[0].offsetHeight height: this.$element[ 0 ].offsetHeight
} ); } );
top = this.top || pos.top + pos.height; top = this.top || pos.top + pos.height;
left = this.left || '25%'; left = this.left || '25%';
@@ -299,7 +299,7 @@
} }
if ( typeof option === 'string' ) { if ( typeof option === 'string' ) {
data[option](); data[ option ]();
} }
} ); } );
}; };

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

@@ -61,7 +61,7 @@
if ( !data ) { if ( !data ) {
// Try to restore the old preferences, if any, if possible. // Try to restore the old preferences, if any, if possible.
try { try {
data = JSON.parse( localStorage.getItem( 'jStorage' ) )['uls-preferences']; data = JSON.parse( localStorage.getItem( 'jStorage' ) )[ 'uls-preferences' ];
// And try to remove it. // And try to remove it.
localStorage.removeItem( 'jStorage' ); localStorage.removeItem( 'jStorage' );
} catch ( e ) { } catch ( e ) {
@@ -122,7 +122,7 @@
* @param value * @param value
*/ */
set: function ( key, value ) { set: function ( key, value ) {
this.preferences[key] = value; this.preferences[ key ] = value;
}, },
/** /**
@@ -131,7 +131,7 @@
* @param key * @param key
*/ */
get: function ( key ) { get: function ( key ) {
return this.preferences[key]; return this.preferences[ key ];
}, },
/** /**