Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/208172
Change subject: Don't load styles unnecessarily
......................................................................
Don't load styles unnecessarily
These are usually only needed via JS. This means we load them twice on
Watchlist for JS users but since that page is lower traffic I think that is
an acceptable trade off whilst bug in comment remains unresolved.
Bug: T97326
Change-Id: I94ea7e9e2481aefe0831dfe121066b647329012f
---
M includes/Resources.php
M includes/skins/SkinMinerva.php
M includes/specials/SpecialMobileEditWatchlist.php
M includes/specials/SpecialMobileWatchlist.php
M includes/specials/SpecialNearby.php
R resources/mobile.pagelist.styles/pagelist.less
6 files changed, 5 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/72/208172/1
diff --git a/includes/Resources.php b/includes/Resources.php
index f0590e9..bf6932d 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -60,7 +60,7 @@
),
'mobile.pagelist.styles' => $wgMFResourceFileModuleBoilerplate + array(
'styles' => array(
- 'less/pagelist.less',
+ 'resources/mobile.pagelist.styles/pagelist.less',
),
),
'skins.minerva.tablet.styles' => $wgMFResourceFileModuleBoilerplate +
array(
@@ -255,6 +255,7 @@
'mobile.pagelist' => $wgMFResourceFileModuleBoilerplate + array(
'dependencies' => array(
'mobile.view',
+ 'mobile.pagelist.styles',
),
'scripts' => array(
'javascripts/PageList.js',
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 34adb9c..84032d0 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -1019,8 +1019,6 @@
'skins.minerva.tablet.styles',
'mediawiki.ui.icon',
'skins.minerva.icons.images',
- // FIXME: This module should be loaded by any special
page that needs it, not here
- 'mobile.pagelist.styles',
);
if ( $title->isSpecialPage() ) {
$styles['special'] = 'skins.minerva.special.styles';
diff --git a/includes/specials/SpecialMobileEditWatchlist.php
b/includes/specials/SpecialMobileEditWatchlist.php
index 4a6873c..c692b6e 100644
--- a/includes/specials/SpecialMobileEditWatchlist.php
+++ b/includes/specials/SpecialMobileEditWatchlist.php
@@ -209,6 +209,7 @@
$out->addModuleStyles(
array(
'skins.minerva.special.styles',
+ // Note: This could result in this module
loading twice due to T87871
'mobile.pagelist.styles',
'mobile.special.pagefeed.styles',
'mobile.special.watchlist.styles'
diff --git a/includes/specials/SpecialMobileWatchlist.php
b/includes/specials/SpecialMobileWatchlist.php
index 5b8394a..73397df 100644
--- a/includes/specials/SpecialMobileWatchlist.php
+++ b/includes/specials/SpecialMobileWatchlist.php
@@ -62,6 +62,8 @@
$user = $this->getUser();
$output = $this->getOutput();
$output->addModules( 'skins.minerva.special.watchlist.scripts'
);
+ // FIXME: Loads twice with JS enabled (T87871)
+ $output->addModuleStyles( 'mobile.pagelist.styles' );
$req = $this->getRequest();
$this->view = $req->getVal( 'watchlistview', 'a-z' );
$this->filter = $req->getVal( 'filter', 'all' );
diff --git a/includes/specials/SpecialNearby.php
b/includes/specials/SpecialNearby.php
index 9d72019..76e2367 100644
--- a/includes/specials/SpecialNearby.php
+++ b/includes/specials/SpecialNearby.php
@@ -29,9 +29,6 @@
// set config
$output->addJsConfigVars( 'wgMFNearbyRange',
$this->getMFConfig()->get( 'MFNearbyRange' ) );
- // Only the Minerva skin loads this module so make sure we load
it for desktop
- $output->addModuleStyles( 'mobile.pagelist.styles' );
-
$output->setPageTitle( wfMessage(
'mobile-frontend-nearby-title' )->escaped() );
$html =
diff --git a/less/pagelist.less b/resources/mobile.pagelist.styles/pagelist.less
similarity index 100%
rename from less/pagelist.less
rename to resources/mobile.pagelist.styles/pagelist.less
--
To view, visit https://gerrit.wikimedia.org/r/208172
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94ea7e9e2481aefe0831dfe121066b647329012f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
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
