From 1589a1586243f9d14f2d37f22145f1527b2063f7 Mon Sep 17 00:00:00 2001 From: Jan Drewniak Date: Fri, 14 Dec 2018 00:45:34 +0100 Subject: [PATCH] Remove references to "mobile.toggle" module. mobile.toggle was folded into mobile.startup in mobileFrontend, so moving references to that instead. - Changing require statements - moving skinStyles/mobile.toggle/minerva.less to skinStyles/mobile.startup/toggle.less - Replacing references to mobile.toggle in skin.json Depends-On: Iecc1870f08532e8c7893861afdd54f069da54be2 Bug: T210208 Change-Id: Ie67cd50a2d042fbbaaef348b9b62d64193900d78 --- resources/skins.minerva.tablet.scripts/toc.js | 2 +- resources/skins.minerva.toggling/init.js | 2 +- skin.json | 9 +++------ .../minerva.less => mobile.startup/toggle.less} | 0 4 files changed, 5 insertions(+), 8 deletions(-) rename skinStyles/{mobile.toggle/minerva.less => mobile.startup/toggle.less} (100%) diff --git a/resources/skins.minerva.tablet.scripts/toc.js b/resources/skins.minerva.tablet.scripts/toc.js index 7b2681a..bb74234 100644 --- a/resources/skins.minerva.tablet.scripts/toc.js +++ b/resources/skins.minerva.tablet.scripts/toc.js @@ -1,6 +1,6 @@ ( function ( M ) { var TableOfContents = M.require( 'mobile.toc/TableOfContents' ), - Toggler = M.require( 'mobile.toggle/Toggler' ), + Toggler = M.require( 'mobile.startup' ).Toggler, eventBus = M.require( 'mobile.startup/eventBusSingleton' ); /** diff --git a/resources/skins.minerva.toggling/init.js b/resources/skins.minerva.toggling/init.js index c442c32..4a84b01 100644 --- a/resources/skins.minerva.toggling/init.js +++ b/resources/skins.minerva.toggling/init.js @@ -1,7 +1,7 @@ ( function ( M ) { var page = M.getCurrentPage(), $contentContainer = $( '#mw-content-text > .mw-parser-output' ), - Toggler = M.require( 'mobile.toggle/Toggler' ), + Toggler = M.require( 'mobile.startup' ).Toggler, eventBus = M.require( 'mobile.startup/eventBusSingleton' ); if ( !page.getLeadSectionElement() ) { diff --git a/skin.json b/skin.json index f1a0df4..3ff53b8 100644 --- a/skin.json +++ b/skin.json @@ -124,7 +124,8 @@ "mobile.startup": [ "skinStyles/mobile.startup/skin.less", "skinStyles/mobile.startup/toast.less", - "skinStyles/mobile.startup/Overlay.less" + "skinStyles/mobile.startup/Overlay.less", + "skinStyles/mobile.startup/toggle.less" ], "mediawiki.special": [ "skinStyles/mobile.special.styles/minerva.less" @@ -132,9 +133,6 @@ "mobile.special.styles": [ "skinStyles/mobile.special.styles/minerva.less" ], - "mobile.toggle": [ - "skinStyles/mobile.toggle/minerva.less" - ], "ext.echo.styles.special": [ "skinStyles/ext.echo.styles.special/SpecialNotificationsOverlay.less" ], @@ -515,7 +513,6 @@ "dependencies": [ "skins.minerva.scripts", "mediawiki.language", - "mobile.toggle", "mobile.startup", "skins.minerva.options.share.icon" ], @@ -557,7 +554,7 @@ "desktop" ], "dependencies": [ - "mobile.toggle", + "mobile.startup", "skins.minerva.icons.images.variants", "skins.minerva.scripts" ], diff --git a/skinStyles/mobile.toggle/minerva.less b/skinStyles/mobile.startup/toggle.less similarity index 100% rename from skinStyles/mobile.toggle/minerva.less rename to skinStyles/mobile.startup/toggle.less