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

Revert "Do not load jquery.jStorage for logged in users"

Browse Source 
This reverts commit 5884337c9f.

Change-Id: Icfdfd89059a417a6aaea30d12164e7174dd5f58b
This commit is contained in:
Nikerabbit
2013-11-12 12:47:56 +00:00
parent 5884337c9f
commit 2bc77f2c18
3 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Resources.php
View File

@@ -118,10 +118,6 @@ $wgResourceModules['ext.uls.interface'] = array(
'position' => 'top',
) + $resourcePaths;
// Anonymous users need 'jquery.jStorage' module for client side preference persistence.
$wgResourceModules['ext.uls.interface.anon'] = $wgResourceModules['ext.uls.interface'];
$wgResourceModules['ext.uls.interface.anon']['dependencies'][] = 'jquery.jStorage';
$wgResourceModules['ext.uls.languagesettings'] = array(
'scripts' => 'resources/js/ext.uls.languagesettings.js',
'styles' => 'resources/css/ext.uls.languagesettings.css',
@@ -137,10 +133,7 @@ $wgResourceModules['ext.uls.preferences'] = array(
'dependencies' => array(
'mediawiki.user',
'mediawiki.api',
'jquery.json',
// This is quite a big module and only needed for anons.
// Loaded conditionally in ext.uls.interface(.anon).
//'jquery.jStorage',
'jquery.jStorage',
),
) + $resourcePaths;

6
UniversalLanguageSelector.hooks.php
View File

@@ -67,11 +67,7 @@ class UniversalLanguageSelectorHooks {
if ( self::isToolbarEnabled( $out->getUser() ) ) {
// Enable UI language selection for the user.
if ( $out->getUser()->isAnon() ) {
$out->addModules( 'ext.uls.interface.anon' );
} else {
$out->addModules( 'ext.uls.interface' );
}
$out->addModules( 'ext.uls.interface' );
}
return true;

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

@@ -115,14 +115,13 @@
* Initialize
*/
init: function () {
var options;
if ( this.isAnon ) {
this.preferences = $.jStorage.get( this.preferenceName ) || {};
this.preferences = $.jStorage.get( this.preferenceName );
} else {
options = mw.user.options.get( this.preferenceName );
this.preferences = $.parseJSON( options ) || {};
var options = mw.user.options.get( this.preferenceName );
this.preferences = $.parseJSON( options );
}
this.preferences = this.preferences || {};
},
/**
@@ -158,6 +157,7 @@
$.jStorage.set( this.preferenceName, this.preferences );
callback.call( this, true );
} else {
// Logged in user. Use MW APIs to change preferences
saveOptionsWithToken( {
action: 'options',