getPageToken now defined in core

Bug: T201124
Depends-On: Id43e9d3f3e687133c98017d24c10c307a5a855a1
Change-Id: I2b519361dfa974acef918e00ffc1ae14e33e28f5
This commit is contained in:
jdlrobson 2018-08-21 12:52:42 -07:00 committed by Krinkle
parent 7962ba87a5
commit 65f2e5ef51
1 changed files with 12 additions and 16 deletions

View File

@ -1,4 +1,4 @@
( function ( M, mwConfig, mwTrack, mwTrackSubscribe, mwUser, mwLoader ) { ( function ( M, mwConfig, mwTrack, mwTrackSubscribe, mwUser ) {
var var
util = M.require( 'mobile.startup/util' ), util = M.require( 'mobile.startup/util' ),
EVENT_PAGE_ISSUE_LOG = 'minerva.PageIssuesAB'; EVENT_PAGE_ISSUE_LOG = 'minerva.PageIssuesAB';
@ -31,11 +31,8 @@
* @return {void} * @return {void}
*/ */
function subscribe( newTreatmentEnabled, pageIssueSchemaData ) { function subscribe( newTreatmentEnabled, pageIssueSchemaData ) {
// this is wrapped inside a mw.loader call given the need to access mw.eventLog.getPageviewToken
// which may or may not be defined. If EventLogging is not installed, so logging will occur.
mwLoader.using( 'ext.eventLogging.subscriber' ).then( function () {
// set the page token on the request. // set the page token on the request.
pageIssueSchemaData.pageToken = mw.eventLog.getPageviewToken(); pageIssueSchemaData.pageToken = mw.user.getPageviewToken();
// intermediary event bus that extends the event data before being passed to event-logging. // intermediary event bus that extends the event data before being passed to event-logging.
mwTrackSubscribe( EVENT_PAGE_ISSUE_LOG, function ( topic, data ) { mwTrackSubscribe( EVENT_PAGE_ISSUE_LOG, function ( topic, data ) {
@ -46,7 +43,6 @@
// Log PageIssues schema. // Log PageIssues schema.
mwTrack( 'wikimedia.event.PageIssues', mixedData ); mwTrack( 'wikimedia.event.PageIssues', mixedData );
} ); } );
} );
} }
/** /**
@ -100,4 +96,4 @@
subscribe: subscribe, subscribe: subscribe,
log: log log: log
} ); } );
}( mw.mobileFrontend, mw.config, mw.track, mw.trackSubscribe, mw.user, mw.loader ) ); }( mw.mobileFrontend, mw.config, mw.track, mw.trackSubscribe, mw.user ) );