mirror of
https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue
synced 2024-09-23 18:28:34 +00:00
Revert "Minerva is responsible for turning on WikimediaEvents itself"
While harmless, this patch is not needed if we take a
different approach as discussed in
https://phabricator.wikimedia.org/T204144#4612790
This reverts commit 01dc9de92e
.
Change-Id: Id2fdd8677042121142ab2663edfa0ee400b8bf22
This commit is contained in:
parent
01dc9de92e
commit
abf445ec9b
|
@ -3,7 +3,6 @@
|
||||||
toast = M.require( 'mobile.startup/toast' ),
|
toast = M.require( 'mobile.startup/toast' ),
|
||||||
time = M.require( 'mobile.startup/time' ),
|
time = M.require( 'mobile.startup/time' ),
|
||||||
skin = M.require( 'mobile.init/skin' ),
|
skin = M.require( 'mobile.init/skin' ),
|
||||||
subscribeToWikimediaEvents = M.require( 'skins.minerva.scripts/subscribeToWikimediaEvents' ),
|
|
||||||
issues = M.require( 'skins.minerva.scripts/pageIssues' ),
|
issues = M.require( 'skins.minerva.scripts/pageIssues' ),
|
||||||
DownloadIcon = M.require( 'skins.minerva.scripts/DownloadIcon' ),
|
DownloadIcon = M.require( 'skins.minerva.scripts/DownloadIcon' ),
|
||||||
browser = M.require( 'mobile.startup/Browser' ).getSingleton(),
|
browser = M.require( 'mobile.startup/Browser' ).getSingleton(),
|
||||||
|
@ -290,9 +289,6 @@
|
||||||
if ( !page.isMissing ) {
|
if ( !page.isMissing ) {
|
||||||
issues.init( overlayManager, page );
|
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 );
|
M.define( 'skins.minerva.scripts/overlayManager', overlayManager );
|
||||||
|
|
|
@ -3,16 +3,7 @@
|
||||||
( function ( M, $ ) {
|
( function ( M, $ ) {
|
||||||
var mainMenu = M.require( 'skins.minerva.scripts.top/mainMenu' );
|
var mainMenu = M.require( 'skins.minerva.scripts.top/mainMenu' );
|
||||||
|
|
||||||
/**
|
|
||||||
* Enable WikimediaEvents including ReadingDepth schema
|
|
||||||
*/
|
|
||||||
function subscribeToWikimediaEvents() {
|
|
||||||
mw.loader.using( 'ext.wikimediaEvents' );
|
|
||||||
}
|
|
||||||
|
|
||||||
$( function () {
|
$( function () {
|
||||||
mainMenu.enableLogging();
|
mainMenu.enableLogging();
|
||||||
} );
|
} );
|
||||||
|
|
||||||
M.define( 'skins.minerva.scripts/subscribeToWikimediaEvents', subscribeToWikimediaEvents );
|
|
||||||
}( mw.mobileFrontend, jQuery ) );
|
}( mw.mobileFrontend, jQuery ) );
|
||||||
|
|
|
@ -424,7 +424,6 @@
|
||||||
},
|
},
|
||||||
"scripts": [
|
"scripts": [
|
||||||
"resources/skins.minerva.scripts/errorLogging.js",
|
"resources/skins.minerva.scripts/errorLogging.js",
|
||||||
"resources/skins.minerva.scripts/initLogging.js",
|
|
||||||
"resources/skins.minerva.scripts/preInit.js",
|
"resources/skins.minerva.scripts/preInit.js",
|
||||||
"resources/skins.minerva.scripts/DownloadIcon.js",
|
"resources/skins.minerva.scripts/DownloadIcon.js",
|
||||||
"resources/skins.minerva.scripts/pageIssuesLogger.js",
|
"resources/skins.minerva.scripts/pageIssuesLogger.js",
|
||||||
|
@ -433,6 +432,7 @@
|
||||||
"resources/skins.minerva.scripts/PageIssuesOverlay.js",
|
"resources/skins.minerva.scripts/PageIssuesOverlay.js",
|
||||||
"resources/skins.minerva.scripts/pageIssues.js",
|
"resources/skins.minerva.scripts/pageIssues.js",
|
||||||
"resources/skins.minerva.scripts/init.js",
|
"resources/skins.minerva.scripts/init.js",
|
||||||
|
"resources/skins.minerva.scripts/initLogging.js",
|
||||||
"resources/skins.minerva.scripts/mobileRedirect.js",
|
"resources/skins.minerva.scripts/mobileRedirect.js",
|
||||||
"resources/skins.minerva.scripts/search.js",
|
"resources/skins.minerva.scripts/search.js",
|
||||||
"resources/skins.minerva.scripts/references.js"
|
"resources/skins.minerva.scripts/references.js"
|
||||||
|
|
Loading…
Reference in a new issue