From b07b326476ef3db1b9d1130b00289ab03587a56d Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Fri, 11 May 2018 16:18:23 +0100 Subject: [PATCH] mediawiki.special.watchlist: Combine visitedstatus module The 'mediawiki.special.changeslist.visitedstatus' module is only used in SpecialWatchlist.php, which also always loads 'mediawiki.special.watchlist'. Thus, registering them as seperate deliverables isn't needed. In terms of size, they're also sufficiently small that even if they could load under different conditions, it'd fine to load as one module regardless. Bug: T192623 Change-Id: I67d78083ce7a3000c05356e3eb0bcb98d0c1e990 --- includes/specials/SpecialWatchlist.php | 1 - resources/Resources.php | 8 ++++---- .../visitedstatus.js} | 0 .../watchlist.js} | 0 4 files changed, 4 insertions(+), 5 deletions(-) rename resources/src/{mediawiki.special.changeslist.visitedstatus.js => mediawiki.special.watchlist/visitedstatus.js} (100%) rename resources/src/{mediawiki.special.watchlist.js => mediawiki.special.watchlist/watchlist.js} (100%) diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index 746084eabb..ea73347c1f 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -62,7 +62,6 @@ class SpecialWatchlist extends ChangesListSpecialPage { $this->addHelpLink( 'Help:Watching pages' ); $output->addModuleStyles( [ 'mediawiki.special' ] ); $output->addModules( [ - 'mediawiki.special.changeslist.visitedstatus', 'mediawiki.special.watchlist', ] ); diff --git a/resources/Resources.php b/resources/Resources.php index cdd225dde9..f0e97b7912 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -2119,9 +2119,6 @@ return [ ], 'targets' => [ 'desktop', 'mobile' ], ], - 'mediawiki.special.changeslist.visitedstatus' => [ - 'scripts' => 'resources/src/mediawiki.special.changeslist.visitedstatus.js', - ], 'mediawiki.special.contributions' => [ 'scripts' => 'resources/src/mediawiki.special.contributions.js', 'dependencies' => [ @@ -2352,7 +2349,10 @@ return [ ], ], 'mediawiki.special.watchlist' => [ - 'scripts' => 'resources/src/mediawiki.special.watchlist.js', + 'scripts' => [ + 'resources/src/mediawiki.special.watchlist/watchlist.js', + 'resources/src/mediawiki.special.watchlist/visitedstatus.js', + ], 'messages' => [ 'addedwatchtext', 'addedwatchtext-talk', diff --git a/resources/src/mediawiki.special.changeslist.visitedstatus.js b/resources/src/mediawiki.special.watchlist/visitedstatus.js similarity index 100% rename from resources/src/mediawiki.special.changeslist.visitedstatus.js rename to resources/src/mediawiki.special.watchlist/visitedstatus.js diff --git a/resources/src/mediawiki.special.watchlist.js b/resources/src/mediawiki.special.watchlist/watchlist.js similarity index 100% rename from resources/src/mediawiki.special.watchlist.js rename to resources/src/mediawiki.special.watchlist/watchlist.js -- 2.20.1