From 2bc77f2c18bcd63843906f2b3b97976299e7b69b Mon Sep 17 00:00:00 2001
From: Nikerabbit <niklas.laxstrom@gmail.com>
Date: Tue, 12 Nov 2013 12:47:56 +0000
Subject: [PATCH] Revert "Do not load jquery.jStorage for logged in users"

This reverts commit 5884337c9f97dc36cc31c1623ddbb3233a0c4357.

Change-Id: Icfdfd89059a417a6aaea30d12164e7174dd5f58b
---
 Resources.php                       |  9 +--------
 UniversalLanguageSelector.hooks.php |  6 +-----
 resources/js/ext.uls.preferences.js | 10 +++++-----
 3 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/Resources.php b/Resources.php
index 2f643038..f5d4d99c 100644
--- a/Resources.php
+++ b/Resources.php
@@ -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;
 
diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php
index 82a9c591..44436a77 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -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;
diff --git a/resources/js/ext.uls.preferences.js b/resources/js/ext.uls.preferences.js
index 5edde741..f0cbb5fa 100644
--- a/resources/js/ext.uls.preferences.js
+++ b/resources/js/ext.uls.preferences.js
@@ -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',