Kaldari has uploaded a new change for review.
https://gerrit.wikimedia.org/r/184000
Change subject: Revising WikiGrok loading conditions
......................................................................
Revising WikiGrok loading conditions
Make sure that WikiGrok loads when debugging or using WikiGrok
Roulette.
Change-Id: I3237f664ebdbd30438aad4806100a5a418c4c8f5
---
M javascripts/modules/wikigrok/init.js
1 file changed, 28 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/00/184000/1
diff --git a/javascripts/modules/wikigrok/init.js
b/javascripts/modules/wikigrok/init.js
index 66a2d09..db04e0a 100644
--- a/javascripts/modules/wikigrok/init.js
+++ b/javascripts/modules/wikigrok/init.js
@@ -104,35 +104,47 @@
}
/**
- * Check whether WikiGrok should be allowed on this page
+ * Check whether WikiGrok interface should be loaded on this page
* @ignore
* @returns {Boolean}
*/
function isWikiGrokAllowed() {
- return (
+ if (
+ // There is a campaign that applies to this page
+ campaign &&
// WikiGrok is enabled and configured for this user
versionConfig &&
- // Only show WikiGrok to 10 in every 62 users so that
we don't overload
- // EventLogging during tests. See
mw.user.generateRandomSessionId().
- ( wikiGrokUser.getToken().charAt( 0 ) < 'A' ||
query.wikidataid || wikiGrokVersion ) &&
// User is not anonymous or we have enabled WikiGrok
for anonymous users
( !mw.user.isAnon() || mw.config.get(
'wgMFEnableWikiGrokForAnons' ) ) &&
- // User hasn't already contributed through WikiGrok on
this page before or they
- // are testing WikiGrok (by using the query string
overrides)
- ( !hasUserAlreadyContributedToWikiGrok() ||
query.wikidataid || wikiGrokVersion ) &&
// We're not on the Main Page
!mw.config.get( 'wgIsMainPage' ) &&
- // Permitted on this device
- permittedOnThisDevice &&
// We're in 'view' mode
mw.config.get( 'wgAction' ) === 'view' &&
+ // We're in Main namespace
+ mw.config.get( 'wgNamespaceNumber' ) === 0 &&
// Wikibase is active and this page has an item ID
- wikidataID &&
- // do we have a campaign?
- campaign &&
- // We're in Main namespace,
- mw.config.get( 'wgNamespaceNumber' ) === 0
- );
+ wikidataID
+ ) {
+ // Bypass certain conditions when debugging or using
WikiGrok Roulette
+ if ( query.wikidataid || wikiGrokVersion ) {
+ return true;
+ }
+ if (
+ // Only show WikiGrok to 10 in every 62 users
so that we don't overload
+ // EventLogging during tests. See
mw.user.generateRandomSessionId().
+ // FIXME: Remove this when A/B test is over and
page-impression and
+ // widget-impression logging have been removed.
+ wikiGrokUser.getToken().charAt( 0 ) < 'A' &&
+ // Permitted on this device. WikiGrok Roulette
is fine on tablet, but
+ // formatting is awkward for other WikiGrok
versions on tablet.
+ permittedOnThisDevice &&
+ // User hasn't already contributed through
WikiGrok on this page before
+ !hasUserAlreadyContributedToWikiGrok()
+ ) {
+ return true;
+ }
+ }
+ return false;
}
if ( isWikiGrokAllowed() ) {
--
To view, visit https://gerrit.wikimedia.org/r/184000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3237f664ebdbd30438aad4806100a5a418c4c8f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Kaldari <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
