Merge "Revert "Minerva is responsible for turning on WikimediaEvents itself""

This commit is contained in:
jenkins-bot 2018-09-26 20:42:38 +00:00 committed by Gerrit Code Review
commit ba827d4b3c
3 changed files with 1 additions and 14 deletions

View file

@ -3,7 +3,6 @@
toast = M.require( 'mobile.startup/toast' ),
time = M.require( 'mobile.startup/time' ),
skin = M.require( 'mobile.init/skin' ),
subscribeToWikimediaEvents = M.require( 'skins.minerva.scripts/subscribeToWikimediaEvents' ),
issues = M.require( 'skins.minerva.scripts/pageIssues' ),
DownloadIcon = M.require( 'skins.minerva.scripts/DownloadIcon' ),
browser = M.require( 'mobile.startup/Browser' ).getSingleton(),
@ -290,9 +289,6 @@
if ( !page.isMissing ) {
issues.init( overlayManager, page );
}
// it's important this runs after issues.init - at which point the A/B test
// has been initialised, and we can turn on ReadingDepth safely.
subscribeToWikimediaEvents();
} );
M.define( 'skins.minerva.scripts/overlayManager', overlayManager );

View file

@ -3,16 +3,7 @@
( function ( M, $ ) {
var mainMenu = M.require( 'skins.minerva.scripts.top/mainMenu' );
/**
* Enable WikimediaEvents including ReadingDepth schema
*/
function subscribeToWikimediaEvents() {
mw.loader.using( 'ext.wikimediaEvents' );
}
$( function () {
mainMenu.enableLogging();
} );
M.define( 'skins.minerva.scripts/subscribeToWikimediaEvents', subscribeToWikimediaEvents );
}( mw.mobileFrontend, jQuery ) );

View file

@ -423,7 +423,6 @@
},
"scripts": [
"resources/skins.minerva.scripts/errorLogging.js",
"resources/skins.minerva.scripts/initLogging.js",
"resources/skins.minerva.scripts/preInit.js",
"resources/skins.minerva.scripts/DownloadIcon.js",
"resources/skins.minerva.scripts/pageIssuesLogger.js",
@ -432,6 +431,7 @@
"resources/skins.minerva.scripts/PageIssuesOverlay.js",
"resources/skins.minerva.scripts/pageIssues.js",
"resources/skins.minerva.scripts/init.js",
"resources/skins.minerva.scripts/initLogging.js",
"resources/skins.minerva.scripts/mobileRedirect.js",
"resources/skins.minerva.scripts/search.js",
"resources/skins.minerva.scripts/references.js"