Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/381098 )
Change subject: Load tablet device code on mobile devices
......................................................................
Load tablet device code on mobile devices
There is little benefit from loading tablet scripts conditionally.
This causes cache fragmentation for the sake of a few bytes.
Let's simplify our code base and
Note table of contents will not load on mobile and will still load
on a resize.
Logic updated to continue to enforce that the table of contents only
shows in main namespace
Change-Id: Iffd1274c35ea17533e4a90a5e5e860c11366c368
---
M resources/skins.minerva.scripts/preInit.js
R resources/skins.minerva.scripts/toc.js
M skin.json
3 files changed, 5 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/98/381098/1
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()
};
diff --git a/resources/skins.minerva.tablet.scripts/toc.js
b/resources/skins.minerva.scripts/toc.js
similarity index 85%
rename from resources/skins.minerva.tablet.scripts/toc.js
rename to resources/skins.minerva.scripts/toc.js
index ba26354..3d1f7c8 100644
--- a/resources/skins.minerva.tablet.scripts/toc.js
+++ b/resources/skins.minerva.scripts/toc.js
@@ -33,8 +33,8 @@
}
}
- // add a ToC only for "view" action (user is reading a page)
- if ( mw.config.get( 'wgAction' ) === 'view' ) {
+ // add a ToC only for "view" action in main namespace (user is reading
a page)
+ if ( mw.config.get( 'wgAction' ) === 'view' && mw.config.get(
'wgNamespaceNumber' ) === 0 ) {
init( M.getCurrentPage() );
}
diff --git a/skin.json b/skin.json
index 47a89cb..6ee1293 100644
--- a/skin.json
+++ b/skin.json
@@ -261,6 +261,7 @@
"mobile.search.api",
"mobile.search",
"mobile.references",
+ "mobile.toc",
"mobile.betaoptin"
],
"messages": [
@@ -282,7 +283,8 @@
"resources/skins.minerva.scripts/mobileRedirect.js",
"resources/skins.minerva.scripts/search.js",
"resources/skins.minerva.scripts/references.js",
-
"resources/skins.minerva.scripts/cleanuptemplates.js"
+
"resources/skins.minerva.scripts/cleanuptemplates.js",
+ "resources/skins.minerva.scripts/toc.js"
]
},
"skins.minerva.scripts.top": {
@@ -462,18 +464,6 @@
],
"scripts": [
"resources/skins.minerva.fontchanger/init.js"
- ]
- },
- "skins.minerva.tablet.scripts": {
- "targets": [
- "mobile",
- "desktop"
- ],
- "dependencies": [
- "mobile.toc"
- ],
- "scripts": [
- "resources/skins.minerva.tablet.scripts/toc.js"
]
}
},
--
To view, visit https://gerrit.wikimedia.org/r/381098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffd1274c35ea17533e4a90a5e5e860c11366c368
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
