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

Whitespace

Browse Source 
Change-Id: I9946260c314600a2147d4f04cdb4da79aa51985e
This commit is contained in:
Amir E. Aharoni
2012-12-31 21:57:31 +02:00
parent ab086a847a
commit 688e15f06d
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@
*/ */
mw.uls.changeLanguage = function ( language ) { mw.uls.changeLanguage = function ( language ) {
var uri = new mw.Uri( window.location.href ); var uri = new mw.Uri( window.location.href );
uri.extend( { uri.extend( {
setlang: language setlang: language
} ); } );
@@ -52,9 +53,11 @@
mw.uls.getPreviousLanguages = function () { mw.uls.getPreviousLanguages = function () {
var previousLanguages = $.cookie( mw.uls.previousLanguagesCookie ); var previousLanguages = $.cookie( mw.uls.previousLanguagesCookie );
if ( !previousLanguages ) { if ( !previousLanguages ) {
return []; return [];
} }
// return last 5 language changes // return last 5 language changes
return $.parseJSON( previousLanguages ).slice( -5 ); return $.parseJSON( previousLanguages ).slice( -5 );
}; };
@@ -79,6 +82,7 @@
.concat( mw.uls.getAcceptLanguageList() ); .concat( mw.uls.getAcceptLanguageList() );
countryCode = mw.uls.getCountryCode(); countryCode = mw.uls.getCountryCode();
if ( countryCode ) { if ( countryCode ) {
list = list.concat( $.uls.data.getLanguagesInTerritory( countryCode ) ); list = list.concat( $.uls.data.getLanguagesInTerritory( countryCode ) );
} }
@@ -100,7 +104,7 @@
/** /**
* i18n initialization * i18n initialization
*/ */
function i18nInit () { function i18nInit() {
var extensionPath, locales, i18n; var extensionPath, locales, i18n;
extensionPath = mw.config.get( 'wgExtensionAssetsPath' ) extensionPath = mw.config.get( 'wgExtensionAssetsPath' )
@@ -130,7 +134,6 @@
} }
} }
} ); } );
} }
$( document ).ready( function () { $( document ).ready( function () {
@@ -143,7 +146,7 @@
previousLanguages = mw.uls.getPreviousLanguages() || []; previousLanguages = mw.uls.getPreviousLanguages() || [];
previousLang = previousLanguages.slice( -1 )[0]; previousLang = previousLanguages.slice( -1 )[0];
function displaySettings () { function displaySettings() {
var $displaySettingsTitle, displaySettingsText, $displaySettings; var $displaySettingsTitle, displaySettingsText, $displaySettings;
displaySettingsText = $.i18n( 'ext-uls-display-settings-desc' ); displaySettingsText = $.i18n( 'ext-uls-display-settings-desc' );
@@ -154,10 +157,11 @@
.addClass( 'display-settings-block' ) .addClass( 'display-settings-block' )
.prop( 'id', 'display-settings-block' ) .prop( 'id', 'display-settings-block' )
.append( $displaySettingsTitle ); .append( $displaySettingsTitle );
return $displaySettings; return $displaySettings;
} }
function inputSettings () { function inputSettings() {
var $inputSettingsTitle, inputSettingsText, $inputSettings; var $inputSettingsTitle, inputSettingsText, $inputSettings;
inputSettingsText = $.i18n( 'ext-uls-input-settings-desc' ); inputSettingsText = $.i18n( 'ext-uls-input-settings-desc' );
@@ -168,10 +172,11 @@
.addClass( 'input-settings-block' ) .addClass( 'input-settings-block' )
.prop( 'id', 'input-settings-block' ) .prop( 'id', 'input-settings-block' )
.append( $inputSettingsTitle ); .append( $inputSettingsTitle );
return $inputSettings; return $inputSettings;
} }
function addDisplaySettings ( uls ) { function addDisplaySettings( uls ) {
var $displaySettings, position; var $displaySettings, position;
$displaySettings = displaySettings(); $displaySettings = displaySettings();
@@ -192,7 +197,7 @@
} ); } );
} }
function addInputSettings ( uls ) { function addInputSettings( uls ) {
var $inputSettings, position; var $inputSettings, position;
$inputSettings = inputSettings(); $inputSettings = inputSettings();
@@ -231,6 +236,7 @@
if ( !previousLang ) { if ( !previousLang ) {
previousLanguages.push( currentLang ); previousLanguages.push( currentLang );
mw.uls.setPreviousLanguages( previousLanguages ); mw.uls.setPreviousLanguages( previousLanguages );
// Do not show tooltip. // Do not show tooltip.
return true; return true;
} }
@@ -260,8 +266,10 @@
lang: previousLang, lang: previousLang,
dir: $.uls.data.getDir( previousLang ) dir: $.uls.data.getDir( previousLang )
} ); } );
// Get the html of the link by wrapping it in div first // Get the html of the link by wrapping it in div first
link = $( '<div>' ).html( link ).html(); link = $( '<div>' ).html( link ).html();
return $.i18n( 'ext-uls-undo-language-tooltip-text', link ); return $.i18n( 'ext-uls-undo-language-tooltip-text', link );
} }
} ); } );