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

Resources.php

@@ -117,10 +117,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',
@@ -138,10 +134,7 @@ $wgResourceModules['ext.uls.preferences'] = array(
 	'dependencies' => array(
 		'mediawiki.user',
 		'mediawiki.api',
-		'jquery.json',
+		'jquery.jStorage',
-		// This is quite a big module and only needed for anons.
-		// Loaded conditionally in ext.uls.interface(.anon).
-		//'jquery.jStorage',
 	),
 ) + $resourcePaths;
 

UniversalLanguageSelector.hooks.php

@@ -67,12 +67,8 @@ 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' );
 		}
-		}
 
 		return true;
 	}

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 );
+				var options = mw.user.options.get( this.preferenceName );
-				this.preferences = $.parseJSON( options ) || {};
+				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',