diff --git a/resources/skins.minerva.scripts/Toolbar.js b/resources/skins.minerva.scripts/Toolbar.js index 2262e20..8cd0c1b 100644 --- a/resources/skins.minerva.scripts/Toolbar.js +++ b/resources/skins.minerva.scripts/Toolbar.js @@ -4,7 +4,7 @@ ToggleList = require( '../../components/ToggleList/ToggleList.js' ), downloadPageAction = require( './downloadPageAction.js' ).downloadPageAction, Icon = mobile.Icon, - skin = M.require( 'mobile.init/skin' ), + skin = mobile.Skin.getSingleton(), /** The top level menu. */ toolbarSelector = '.page-actions-menu', /** The secondary overflow submenu component container. */ diff --git a/resources/skins.minerva.scripts/preInit.js b/resources/skins.minerva.scripts/preInit.js index 2d045e6..0b0c25c 100644 --- a/resources/skins.minerva.scripts/preInit.js +++ b/resources/skins.minerva.scripts/preInit.js @@ -7,9 +7,10 @@ */ module.exports = function () { var M = mw.mobileFrontend, - skin = M.require( 'mobile.init/skin' ), + mobile = M.require( 'mobile.startup' ), + skin = mobile.Skin.getSingleton(), mainMenu = require( './menu.js' ), - toast = M.require( 'mobile.startup' ).toast; + toast = mobile.toast; /** * Close navigation if skin is tapped diff --git a/resources/skins.minerva.talk/init.js b/resources/skins.minerva.talk/init.js index 58656f3..00d5b25 100644 --- a/resources/skins.minerva.talk/init.js +++ b/resources/skins.minerva.talk/init.js @@ -13,7 +13,7 @@ title = $talk.attr( 'data-title' ), overlayManager = require( 'skins.minerva.scripts' ).overlayManager, // FIXME: This dependency shouldn't exist - skin = M.require( 'mobile.init/skin' ), + skin = mobile.Skin.getSingleton(), inTalkNamespace = false, pageTitle, talkTitle, talkNs, pageNs; diff --git a/skin.json b/skin.json index d3cfbc3..bd93ace 100644 --- a/skin.json +++ b/skin.json @@ -441,7 +441,6 @@ "skins.minerva.mainMenu.icons", "skins.minerva.mainMenu.styles", "jquery.cookie", - "mobile.init", "skins.minerva.icons.images.scripts", "mediawiki.util", "mediawiki.router",