From bbcd4b128cb7350ee65190e601b8d636e109f43b Mon Sep 17 00:00:00 2001
From: Fomafix <fomafix@googlemail.com>
Date: Tue, 24 Feb 2015 19:17:27 +0000
Subject: [PATCH] mediawiki.user: Simplify extension of mw.user

The module 'mediawiki.user' depends on module 'mediawiki'.
'mediawiki' already defines mw.user with the properties options and tokens
and initializes them with mw.Map(). A reinitialization is not necessary.

Change-Id: I282a8c0eb62ae960eec495cd8cc94efea9decc2a
---
 resources/src/mediawiki/mediawiki.user.js | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/resources/src/mediawiki/mediawiki.user.js b/resources/src/mediawiki/mediawiki.user.js
index 04d9ec65ce..b777cd3edc 100644
--- a/resources/src/mediawiki/mediawiki.user.js
+++ b/resources/src/mediawiki/mediawiki.user.js
@@ -3,13 +3,9 @@
  * @singleton
  */
 ( function ( mw, $ ) {
-	var user, i,
+	var i,
 		deferreds = {},
-		byteToHex = [],
-		// Extend the skeleton mw.user from mediawiki.js
-		// This is kind of ugly but we're stuck with this for b/c reasons
-		options = mw.user.options || new mw.Map(),
-		tokens = mw.user.tokens || new mw.Map();
+		byteToHex = [];
 
 	/**
 	 * Get the current user's groups or rights
@@ -51,9 +47,8 @@
 		byteToHex[i] = ( i + 256 ).toString( 16 ).slice( 1 );
 	}
 
-	mw.user = user = {
-		options: options,
-		tokens: tokens,
+	// mw.user with the properties options and tokens gets defined in mediawiki.js.
+	$.extend( mw.user, {
 
 		/**
 		 * Generate a random user session ID.
@@ -135,7 +130,7 @@
 		 */
 		getRegistration: function () {
 			var registration = mw.config.get( 'wgUserRegistration' );
-			if ( user.isAnon() ) {
+			if ( mw.user.isAnon() ) {
 				return false;
 			}
 			if ( registration === null ) {
@@ -152,7 +147,7 @@
 		 * @return {boolean}
 		 */
 		isAnon: function () {
-			return user.getName() === null;
+			return mw.user.getName() === null;
 		},
 
 		/**
@@ -166,7 +161,7 @@
 		sessionId: function () {
 			var sessionId = $.cookie( 'mediaWiki.user.sessionId' );
 			if ( sessionId === undefined || sessionId === null ) {
-				sessionId = user.generateRandomSessionId();
+				sessionId = mw.user.generateRandomSessionId();
 				$.cookie( 'mediaWiki.user.sessionId', sessionId, { expires: null, path: '/' } );
 			}
 			return sessionId;
@@ -180,7 +175,7 @@
 		 * @return {string} User name or random session ID
 		 */
 		id: function () {
-			return user.getName() || user.sessionId();
+			return mw.user.getName() || mw.user.sessionId();
 		},
 
 		/**
@@ -279,6 +274,6 @@
 		getRights: function ( callback ) {
 			return getUserInfo( 'rights' ).done( callback );
 		}
-	};
+	} );
 
 }( mediaWiki, jQuery ) );
-- 
2.20.1