Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376546 )
Change subject: Hygiene: Cleanup initialisation files
......................................................................
Hygiene: Cleanup initialisation files
* Remove deprecated module definitions
* Remove unnecessary check for Minerva skin (this is only
ever run by Minerva skin)
* Move overlay to place it is first used
Change-Id: I17ea52172e7fae0a8f0e06b8418c7ed5bb01ef64
---
M resources/skins.minerva.scripts/init.js
M resources/skins.minerva.scripts/preInit.js
2 files changed, 6 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/46/376546/1
diff --git a/resources/skins.minerva.scripts/init.js
b/resources/skins.minerva.scripts/init.js
index d1b23b8..81086e3 100644
--- a/resources/skins.minerva.scripts/init.js
+++ b/resources/skins.minerva.scripts/init.js
@@ -7,7 +7,8 @@
loader = M.require( 'mobile.startup/rlModuleLoader' ),
router = require( 'mediawiki.router' ),
context = M.require( 'mobile.startup/context' ),
- overlayManager = M.require(
'skins.minerva.scripts/overlayManager' ),
+ OverlayManager = M.require( 'mobile.startup/OverlayManager' ),
+ overlayManager = new OverlayManager( require(
'mediawiki.router' ) ),
page = M.getCurrentPage(),
thumbs = page.getThumbnails(),
experiments = mw.config.get( 'wgMFExperiments' ) || {},
@@ -243,4 +244,6 @@
initRegistrationInfo();
initHistoryLink( $( '.last-modifier-tagline a' ) );
} );
+
+ M.define( 'skins.minerva.scripts/overlayManager', overlayManager );
}( mw.mobileFrontend, jQuery ) );
diff --git a/resources/skins.minerva.scripts/preInit.js
b/resources/skins.minerva.scripts/preInit.js
index 4736030..9b3056e 100644
--- a/resources/skins.minerva.scripts/preInit.js
+++ b/resources/skins.minerva.scripts/preInit.js
@@ -7,8 +7,6 @@
*/
( function ( M, $ ) {
var currentPage, skin,
- OverlayManager = M.require( 'mobile.startup/OverlayManager' ),
- overlayManager = new OverlayManager( require(
'mediawiki.router' ) ),
PageGateway = M.require( 'mobile.startup/PageGateway' ),
gateway = new PageGateway( new mw.Api() ),
Page = M.require( 'mobile.startup/Page' ),
@@ -20,14 +18,14 @@
),
skinData = {
el: 'body',
- tabletModules: mw.config.get( 'skin' ) === 'minerva' ?
[ 'skins.minerva.tablet.scripts' ] : [],
+ tabletModules: [ 'skins.minerva.tablet.scripts' ],
page: getCurrentPage(),
referencesGateway:
ReferencesMobileViewGateway.getSingleton(),
mainMenu: mainMenu
};
skin = new Skin( skinData );
- M.define( 'skins.minerva.scripts/skin', skin ).deprecate(
'mobile.startup/skin' );
+ M.define( 'skins.minerva.scripts/skin', skin );
( function ( wgRedirectedFrom ) {
// If the user has been redirected, then show them a toast
message (see
@@ -145,7 +143,4 @@
console.log( mw.msg( 'mobile-frontend-console-recruit' ) );
}
/* eslint-enable no-console */
-
- M.define( 'skins.minerva.scripts/overlayManager', overlayManager )
- .deprecate( 'mobile.startup/overlayManager' );
}( mw.mobileFrontend, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/376546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I17ea52172e7fae0a8f0e06b8418c7ed5bb01ef64
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
