Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/387961 )
Change subject: Hygiene: Make usages of mw.user clearer
......................................................................
Hygiene: Make usages of mw.user clearer
Bug: T172454
Change-Id: I420c924a573fb4d86e9017dad87d290304b6a6dc
---
M resources/mobile.editor.common/EditorOverlayBase.js
M resources/mobile.init/BetaOptinPanel.js
M resources/mobile.search/MobileWebSearchLogger.js
M resources/mobile.special.mobilediff.scripts/init.js
M resources/mobile.startup/user.js
M tests/qunit/mobile.talk.overlays/test_TalkOverlay.js
6 files changed, 23 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/61/387961/1
diff --git a/resources/mobile.editor.common/EditorOverlayBase.js
b/resources/mobile.editor.common/EditorOverlayBase.js
index 6a64da2..c0ad8e2 100644
--- a/resources/mobile.editor.common/EditorOverlayBase.js
+++ b/resources/mobile.editor.common/EditorOverlayBase.js
@@ -1,5 +1,6 @@
( function ( M, $ ) {
var Overlay = M.require( 'mobile.startup/Overlay' ),
+ user = mw.user,
PageGateway = M.require( 'mobile.startup/PageGateway' ),
Icon = M.require( 'mobile.startup/Icon' ),
toast = M.require( 'mobile.startup/toast' ),
@@ -47,7 +48,7 @@
var self = this;
if ( options.isNewPage ) {
- options.placeholder = mw.msg(
'mobile-frontend-editor-placeholder-new-page', mw.user );
+ options.placeholder = mw.msg(
'mobile-frontend-editor-placeholder-new-page', user );
}
// change the message to request a summary when not in article
namespace
if ( mw.config.get( 'wgNamespaceNumber' ) !== 0 ) {
@@ -161,7 +162,7 @@
if ( this.isNewPage &&
// TODO: Replace with an OOUI dialog
// eslint-disable-next-line no-alert
- !window.confirm( mw.msg(
'mobile-frontend-editor-new-page-confirm', mw.user ) )
+ !window.confirm( mw.msg(
'mobile-frontend-editor-new-page-confirm', user ) )
) {
return false;
} else {
diff --git a/resources/mobile.init/BetaOptinPanel.js
b/resources/mobile.init/BetaOptinPanel.js
index a0adeb0..2964e6c 100644
--- a/resources/mobile.init/BetaOptinPanel.js
+++ b/resources/mobile.init/BetaOptinPanel.js
@@ -1,6 +1,7 @@
( function ( M, $ ) {
var Button = M.require( 'mobile.startup/Button' ),
+ user = mw.user,
Panel = M.require( 'mobile.startup/Panel' );
/**
@@ -19,7 +20,7 @@
template: mw.template.get( 'mobile.init', 'Panel.hogan' ),
defaults: $.extend( {}, Panel.prototype.defaults, {
postUrl: undefined,
- editToken: mw.user.tokens.get( 'editToken' ),
+ editToken: user.tokens.get( 'editToken' ),
text: mw.msg( 'mobile-frontend-panel-betaoptin-msg' ),
buttons: [
new Button( {
diff --git a/resources/mobile.search/MobileWebSearchLogger.js
b/resources/mobile.search/MobileWebSearchLogger.js
index f73ff6f..49f4340 100644
--- a/resources/mobile.search/MobileWebSearchLogger.js
+++ b/resources/mobile.search/MobileWebSearchLogger.js
@@ -1,4 +1,6 @@
( function ( M, mw ) {
+ var user = mw.user;
+
/**
* Coordinates the logging of MobileWebSchema events.
* Implements schema defined at
https://meta.wikimedia.org/wiki/Schema:MobileWebSearch
@@ -18,7 +20,7 @@
* @private
*/
_newUserSession: function () {
- this.userSessionToken =
mw.user.generateRandomSessionId();
+ this.userSessionToken = user.generateRandomSessionId();
},
/**
@@ -28,7 +30,7 @@
* @private
*/
_newSearchSession: function () {
- this.searchSessionToken =
mw.user.generateRandomSessionId();
+ this.searchSessionToken =
user.generateRandomSessionId();
this.searchSessionCreatedAt = new Date().getTime();
},
diff --git a/resources/mobile.special.mobilediff.scripts/init.js
b/resources/mobile.special.mobilediff.scripts/init.js
index d900f09..31c2748 100644
--- a/resources/mobile.special.mobilediff.scripts/init.js
+++ b/resources/mobile.special.mobilediff.scripts/init.js
@@ -5,7 +5,9 @@
* @author Florian Schmidt <florian.schmidt.wel...@t-online.de>
*/
( function ( M, $ ) {
- if ( !mw.user.tokens.exists( 'patrolToken' ) ) {
+ var user = mw.user;
+
+ if ( !user.tokens.exists( 'patrolToken' ) ) {
// Current user has no patrol right, or an old cached version
of user.tokens
// that didn't have patrolToken yet.
return;
diff --git a/resources/mobile.startup/user.js b/resources/mobile.startup/user.js
index 1aca1fa..fc816ea 100644
--- a/resources/mobile.startup/user.js
+++ b/resources/mobile.startup/user.js
@@ -4,15 +4,18 @@
* @class user
* @singleton
*/
- var user = {
+ var user,
+ mwUser = mw.user;
+
+ user = {
/* @see mediaWiki.user */
- tokens: mw.user.tokens,
+ tokens: mwUser.tokens,
/* @see mediaWiki.user */
- isAnon: mw.user.isAnon,
+ isAnon: mwUser.isAnon,
/* @see mediaWiki.user */
- getName: mw.user.getName,
+ getName: mwUser.getName,
/* @see mediaWiki.user */
- getId: mw.user.getId,
+ getId: mwUser.getId,
/**
* Find current users edit count
* @method
@@ -39,7 +42,7 @@
* @return {string}
*/
getSessionId: function () {
- return mw.user.sessionId();
+ return mwUser.sessionId();
},
/**
diff --git a/tests/qunit/mobile.talk.overlays/test_TalkOverlay.js
b/tests/qunit/mobile.talk.overlays/test_TalkOverlay.js
index 2d3a117..b2c8e08 100644
--- a/tests/qunit/mobile.talk.overlays/test_TalkOverlay.js
+++ b/tests/qunit/mobile.talk.overlays/test_TalkOverlay.js
@@ -1,6 +1,7 @@
( function ( M, $ ) {
var PageGateway = M.require( 'mobile.startup/PageGateway' ),
+ user = mw.user,
TalkOverlay = M.require( 'mobile.talk.overlays/TalkOverlay' );
QUnit.module( 'MobileFrontend TalkOverlay', {
@@ -22,7 +23,7 @@
} )
);
- this.user = mw.user.getName() || '';
+ this.user = user.getName() || '';
},
teardown: function () {
mw.config.set( 'wgUserName', this.user );
--
To view, visit https://gerrit.wikimedia.org/r/387961
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I420c924a573fb4d86e9017dad87d290304b6a6dc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
