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

Lazy initilization of language settings from ULS

Browse Source 
For personal toolbar position, initialize langauge settings only
after user clicks on the settings links

Bug: 48211

Change-Id: Ib3e2372e982de890db614a81c06fbbe170ce0d01
This commit is contained in:
Santhosh Thottingal
2013-07-24 16:35:50 +05:30
parent bebf6c4885
commit 472432517a
1 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,7 @@
/** /**
* Construct the display settings link * Construct the display settings link
* @return {jQuery}
*/ */
function displaySettings() { function displaySettings() {
var $displaySettingsTitle, displaySettingsText, $displaySettings; var $displaySettingsTitle, displaySettingsText, $displaySettings;
@@ -40,6 +41,7 @@
/** /**
* Construct the input settings link * Construct the input settings link
* @returns {jQuery}
*/ */
function inputSettings() { function inputSettings() {
var $inputSettingsTitle, inputSettingsText, $inputSettings; var $inputSettingsTitle, inputSettingsText, $inputSettings;
@@ -61,28 +63,32 @@
* @param {Object} uls The ULS object * @param {Object} uls The ULS object
*/ */
function addDisplaySettings( uls ) { function addDisplaySettings( uls ) {
var $displaySettings = displaySettings(), var $displaySettings = displaySettings();
ulsPosition = mw.config.get( 'wgULSPosition' ),
anonMode = ( mw.user.isAnon() &&
!mw.config.get( 'wgULSAnonCanChangeLanguage' ) ),
displaySettingsOptions = {
defaultModule: 'display'
};
// If the ULS trigger is shown in the top personal menu,
// closing the display settings must show the main ULS
// languages list, unless we are in anon mode and thus
// cannot show the language list
if ( ulsPosition === 'personal' && !anonMode ) {
displaySettingsOptions.onClose = function () {
uls.show();
};
}
$.extend( displaySettingsOptions, uls.position() );
uls.$menu.find( '#settings-block' ).append( $displaySettings ); uls.$menu.find( '#settings-block' ).append( $displaySettings );
$displaySettings.languagesettings( displaySettingsOptions );
$displaySettings.on( 'click', function () { $displaySettings.on( 'click', function () {
var languagesettings = $displaySettings.data( 'languagesettings' ),
displaySettingsOptions = {
defaultModule: 'display'
},
ulsPosition = mw.config.get( 'wgULSPosition' ),
anonMode = ( mw.user.isAnon() &&
!mw.config.get( 'wgULSAnonCanChangeLanguage' ) );
if ( !languagesettings ) {
// If the ULS trigger is shown in the top personal menu,
// closing the display settings must show the main ULS
// languages list, unless we are in anon mode and thus
// cannot show the language list
if ( ulsPosition === 'personal' && !anonMode ) {
displaySettingsOptions.onClose = function () {
uls.show();
};
}
$.extend( displaySettingsOptions, uls.position() );
$displaySettings.languagesettings( displaySettingsOptions )
.click();
}
uls.hide(); uls.hide();
} ); } );
} }
@@ -92,22 +98,23 @@
* @param {Object} uls The ULS object * @param {Object} uls The ULS object
*/ */
function addInputSettings( uls ) { function addInputSettings( uls ) {
var $inputSettings, position; var $inputSettings = inputSettings();
$inputSettings = inputSettings();
uls.$menu.find( '#settings-block' ).append( $inputSettings ); uls.$menu.find( '#settings-block' ).append( $inputSettings );
position = uls.position();
$inputSettings.languagesettings( {
defaultModule: 'input',
onClose: function () {
uls.show();
},
top: position.top,
left: position.left
} );
$inputSettings.on( 'click', function () { $inputSettings.on( 'click', function () {
var position = uls.position(),
languagesettings = $inputSettings.data( 'languagesettings' );
if ( !languagesettings ) {
$inputSettings.languagesettings( {
defaultModule: 'input',
onClose: function () {
uls.show();
},
top: position.top,
left: position.left
} ).click();
}
uls.hide(); uls.hide();
} ); } );
} }