Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/93051
Change subject: Do not load jquery.jStorage for logged in users
......................................................................
Do not load jquery.jStorage for logged in users
Change-Id: Ibe77962cecd6aa8504aa60d5d2b8d17a56e1319f
---
M Resources.php
M resources/js/ext.uls.preferences.js
2 files changed, 12 insertions(+), 6 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/51/93051/1
diff --git a/Resources.php b/Resources.php
index 41ae36d..e74d3b8 100644
--- a/Resources.php
+++ b/Resources.php
@@ -129,7 +129,10 @@
'dependencies' => array(
'mediawiki.user',
'mediawiki.api',
- 'jquery.jStorage',
+ 'jquery.json',
+ # This is quite big module and only needed for anons, so we
load it
+ # conditionally only for anons.
+ # 'jquery.jStorage',
),
) + $resourcePaths;
diff --git a/resources/js/ext.uls.preferences.js
b/resources/js/ext.uls.preferences.js
index f0cbb5f..a6dd102 100644
--- a/resources/js/ext.uls.preferences.js
+++ b/resources/js/ext.uls.preferences.js
@@ -115,13 +115,17 @@
* Initialize
*/
init: function () {
+ var options,
+ self = this;
+
if ( this.isAnon ) {
- this.preferences = $.jStorage.get(
this.preferenceName );
+ mw.loader.using( 'jquery.jStorage', function ()
{
+ self.preferences = $.jStorage.get(
self.preferenceName ) || {};
+ } );
} else {
- var options = mw.user.options.get(
this.preferenceName );
- this.preferences = $.parseJSON( options );
+ options = mw.user.options.get(
this.preferenceName );
+ this.preferences = $.parseJSON( options ) || {};
}
- this.preferences = this.preferences || {};
},
/**
@@ -157,7 +161,6 @@
$.jStorage.set( this.preferenceName,
this.preferences );
callback.call( this, true );
} else {
-
// Logged in user. Use MW APIs to change
preferences
saveOptionsWithToken( {
action: 'options',
--
To view, visit https://gerrit.wikimedia.org/r/93051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe77962cecd6aa8504aa60d5d2b8d17a56e1319f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
