Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/383720 )
Change subject: Minerva is responsible for loading tablet modules in tablet mode
......................................................................
Minerva is responsible for loading tablet modules in tablet mode
Since Minerva is the only skin which does this kind of thing, it
was premature to add this logic to the Skin module.
By forcing Minerva to do this itself, we allow MobileFrontend to
be responsible for creating a Skin without having to know about
what that skin may want to load in tablet mode.
(see I8503c26bd064ae0d203f95a35031468c7c678ac1)
Bug: T173454
Change-Id: I32e2b4a10799a06138bfee08abc6769a6b96004d
---
M resources/skins.minerva.scripts/init.js
M resources/skins.minerva.scripts/preInit.js
2 files changed, 13 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/20/383720/1
diff --git a/resources/skins.minerva.scripts/init.js
b/resources/skins.minerva.scripts/init.js
index 81086e3..7198bfa 100644
--- a/resources/skins.minerva.scripts/init.js
+++ b/resources/skins.minerva.scripts/init.js
@@ -2,6 +2,7 @@
var inSample, inStable, experiment,
toast = M.require( 'mobile.startup/toast' ),
time = M.require( 'mobile.startup/time' ),
+ browser = M.require( 'mobile.startup/Browser' ).getSingleton(),
token = mw.storage.get( 'mobile-betaoptin-token' ),
BetaOptinPanel = M.require( 'mobile.betaoptin/BetaOptinPanel' ),
loader = M.require( 'mobile.startup/rlModuleLoader' ),
@@ -71,6 +72,16 @@
navigator.browserLanguage ||
navigator.systemLanguage;
return lang ? lang.toLowerCase() : undefined;
+ }
+
+ /**
+ * Loads tablet modules when the skin is in tablet mode.
+ * @private
+ */
+ function loadTabletModules() {
+ if ( browser.isWideScreen() && page.inNamespace( '' ) ) {
+ mw.loader.using( 'skins.minerva.tablet.scripts' );
+ }
}
/**
@@ -243,6 +254,8 @@
initModifiedInfo();
initRegistrationInfo();
initHistoryLink( $( '.last-modifier-tagline a' ) );
+ M.on( 'resize', loadTabletModules );
+ loadTabletModules();
} );
M.define( 'skins.minerva.scripts/overlayManager', overlayManager );
diff --git a/resources/skins.minerva.scripts/preInit.js
b/resources/skins.minerva.scripts/preInit.js
index 2f4491b..645ec01 100644
--- a/resources/skins.minerva.scripts/preInit.js
+++ b/resources/skins.minerva.scripts/preInit.js
@@ -18,7 +18,6 @@
),
skinData = {
el: 'body',
- tabletModules: [ 'skins.minerva.tablet.scripts' ],
page: getCurrentPage(),
referencesGateway:
ReferencesMobileViewGateway.getSingleton()
};
--
To view, visit https://gerrit.wikimedia.org/r/383720
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32e2b4a10799a06138bfee08abc6769a6b96004d
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
