jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.user: Simplify extension of mw.user
......................................................................
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
---
M resources/src/mediawiki/mediawiki.user.js
1 file changed, 9 insertions(+), 14 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/mediawiki.user.js
b/resources/src/mediawiki/mediawiki.user.js
index 04d9ec6..b777cd3 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 ) );
--
To view, visit https://gerrit.wikimedia.org/r/192599
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I282a8c0eb62ae960eec495cd8cc94efea9decc2a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Gerrit Patch Uploader <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
