Jhernandez has uploaded a new change for review.
https://gerrit.wikimedia.org/r/169598
Change subject: Show WikiGrok to readers in alpha/beta
......................................................................
Show WikiGrok to readers in alpha/beta
Logged out users can see wikigrok versions a & b now.
User tokens can be differenciated from anonymous tokens based on a prefix
Change-Id: I6af487ad3d87f9639c5575b5902ee27efd4a4b18
---
M javascripts/modules/wikigrok/wikigrok.js
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/98/169598/1
diff --git a/javascripts/modules/wikigrok/wikigrok.js
b/javascripts/modules/wikigrok/wikigrok.js
index a0e05d2..7e8ba25 100644
--- a/javascripts/modules/wikigrok/wikigrok.js
+++ b/javascripts/modules/wikigrok/wikigrok.js
@@ -13,16 +13,19 @@
*
* @return {string}
*/
- function getUserToken () {
- var cookieName = mw.config.get( 'wgCookiePrefix' ) +
'-wikiGrokUserToken',
+ function getUserToken() {
+ var anonymousCookieName = mw.config.get( 'wgCookiePrefix' ) +
'-wikiGrokAnonymousUserToken',
+ loggedInCookieName = mw.config.get( 'wgCookiePrefix' )
+ '-wikiGrokUserToken',
+ cookieName = mw.user.isAnon() ? anonymousCookieName :
loggedInCookieName,
storedToken = $.cookie( cookieName ),
+ tokenPrefix = mw.user.isAnon() ? 'anon-' : 'user-',
generatedToken;
if ( storedToken ) {
return storedToken;
}
- generatedToken = mw.user.generateRandomSessionId();
+ generatedToken = tokenPrefix +
mw.user.generateRandomSessionId();
$.cookie( cookieName, generatedToken, {
expires: 90, // (days)
@@ -31,7 +34,6 @@
return generatedToken;
}
-
// Allow query string override for testing, for example,
'?wikidataid=Q508703'
if ( !wikidataID ) {
@@ -50,8 +52,6 @@
if (
// WikiGrok is enabled
mw.config.get( 'wgMFEnableWikiGrok' ) &&
- // User is logged in
- !mw.user.isAnon() &&
// We're not on the Main Page
!mw.config.get( 'wgIsMainPage' ) &&
// Permitted on this device
--
To view, visit https://gerrit.wikimedia.org/r/169598
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6af487ad3d87f9639c5575b5902ee27efd4a4b18
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jhernandez <jhernan...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
