From 419849211e3a638884f13d9a7a7f43b898d1d2a4 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Fri, 14 Jun 2019 18:30:28 +0100 Subject: [PATCH] specials: Combine small miscellaneous 'mediawiki.special.*' modules The format for this would be cleaner if T225842 were solved. Bug: T193826 Bug: T219342 Change-Id: I9aaa52b567db254e1e79649b3b99260214da74b3 --- .../specials/SpecialChangeCredentials.php | 4 +- includes/specials/SpecialMovepage.php | 2 +- includes/specials/SpecialPageLanguage.php | 2 +- resources/Resources.php | 40 +++++++++---------- .../special.changecredentials.js} | 0 .../special.movePage.js} | 0 .../special.mute.js} | 0 .../special.pageLanguage.js} | 0 8 files changed, 23 insertions(+), 25 deletions(-) rename resources/src/{mediawiki.special.changecredentials.js => mediawiki.misc-authed-ooui/special.changecredentials.js} (100%) rename resources/src/{mediawiki.special.movePage.js => mediawiki.misc-authed-ooui/special.movePage.js} (100%) rename resources/src/{mediawiki.special.mute.js => mediawiki.misc-authed-ooui/special.mute.js} (100%) rename resources/src/{mediawiki.special.pageLanguage.js => mediawiki.misc-authed-ooui/special.pageLanguage.js} (100%) diff --git a/includes/specials/SpecialChangeCredentials.php b/includes/specials/SpecialChangeCredentials.php index 1d0ff21cf2..f899d76a35 100644 --- a/includes/specials/SpecialChangeCredentials.php +++ b/includes/specials/SpecialChangeCredentials.php @@ -141,9 +141,7 @@ class SpecialChangeCredentials extends AuthManagerSpecialPage { } if ( $any ) { - $this->getOutput()->addModules( [ - 'mediawiki.special.changecredentials.js' - ] ); + $this->getOutput()->addModules( 'mediawiki.misc-authed-ooui' ); } return $descriptor; diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php index 252df5be09..ecbbc25bca 100644 --- a/includes/specials/SpecialMovepage.php +++ b/includes/specials/SpecialMovepage.php @@ -147,7 +147,7 @@ class MovePageForm extends UnlistedSpecialPage { $out = $this->getOutput(); $out->setPageTitle( $this->msg( 'move-page', $this->oldTitle->getPrefixedText() ) ); $out->addModuleStyles( 'mediawiki.special' ); - $out->addModules( 'mediawiki.special.movePage' ); + $out->addModules( 'mediawiki.misc-authed-ooui' ); $this->addHelpLink( 'Help:Moving a page' ); $out->addWikiMsg( $this->getConfig()->get( 'FixDoubleRedirects' ) ? diff --git a/includes/specials/SpecialPageLanguage.php b/includes/specials/SpecialPageLanguage.php index 7e41305bb1..c0f004ffa6 100644 --- a/includes/specials/SpecialPageLanguage.php +++ b/includes/specials/SpecialPageLanguage.php @@ -43,7 +43,7 @@ class SpecialPageLanguage extends FormSpecialPage { } protected function preText() { - $this->getOutput()->addModules( 'mediawiki.special.pageLanguage' ); + $this->getOutput()->addModules( 'mediawiki.misc-authed-ooui' ); return parent::preText(); } diff --git a/resources/Resources.php b/resources/Resources.php index 28b8793f3e..92b4fd4492 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -2092,11 +2092,27 @@ return [ ], 'targets' => [ 'desktop', 'mobile' ], ], - 'mediawiki.special.changecredentials.js' => [ - 'scripts' => 'resources/src/mediawiki.special.changecredentials.js', + // This bundles various small (under 5 KB?) JavaScript files that: + // - .. are not loaded on when viewing or editing wiki pages. + // - .. are used by logged-in users only. + // - .. depend on oojs-ui-core. + // - .. contain UI intialisation code (e.g. no public module exports, because + // requiring or depending on this bundle is awkard) + 'mediawiki.misc-authed-ooui' => [ + 'localBasePath' => "$IP/resources/src/mediawiki.misc-authed-ooui", + 'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.misc-authed-ooui", + 'scripts' => [ + 'special.changecredentials.js', + 'special.movePage.js', + 'special.mute.js', + 'special.pageLanguage.js', + ], 'dependencies' => [ - 'mediawiki.api', - 'mediawiki.htmlform.ooui' + 'mediawiki.api', // Used by special.changecredentials.js + 'mediawiki.htmlform.ooui', // Used by special.changecredentials.js + 'mediawiki.widgets.visibleLengthLimit', // Used by special.movePage.js + 'mediawiki.widgets', // Used by special.movePage.js + 'oojs-ui-core', // Used by special.pageLanguage.js ], 'targets' => [ 'desktop', 'mobile' ], ], @@ -2145,22 +2161,6 @@ return [ 'mediawiki.special.import' => [ 'scripts' => 'resources/src/mediawiki.special.import.js', ], - 'mediawiki.special.movePage' => [ - 'scripts' => 'resources/src/mediawiki.special.movePage.js', - 'dependencies' => [ - 'mediawiki.widgets.visibleLengthLimit', - 'mediawiki.widgets', - ], - ], - 'mediawiki.special.pageLanguage' => [ - 'scripts' => [ - 'resources/src/mediawiki.special.mute.js', - 'resources/src/mediawiki.special.pageLanguage.js' - ], - 'dependencies' => [ - 'oojs-ui-core', - ], - ], 'mediawiki.special.preferences.ooui' => [ 'targets' => [ 'desktop', 'mobile' ], 'scripts' => [ diff --git a/resources/src/mediawiki.special.changecredentials.js b/resources/src/mediawiki.misc-authed-ooui/special.changecredentials.js similarity index 100% rename from resources/src/mediawiki.special.changecredentials.js rename to resources/src/mediawiki.misc-authed-ooui/special.changecredentials.js diff --git a/resources/src/mediawiki.special.movePage.js b/resources/src/mediawiki.misc-authed-ooui/special.movePage.js similarity index 100% rename from resources/src/mediawiki.special.movePage.js rename to resources/src/mediawiki.misc-authed-ooui/special.movePage.js diff --git a/resources/src/mediawiki.special.mute.js b/resources/src/mediawiki.misc-authed-ooui/special.mute.js similarity index 100% rename from resources/src/mediawiki.special.mute.js rename to resources/src/mediawiki.misc-authed-ooui/special.mute.js diff --git a/resources/src/mediawiki.special.pageLanguage.js b/resources/src/mediawiki.misc-authed-ooui/special.pageLanguage.js similarity index 100% rename from resources/src/mediawiki.special.pageLanguage.js rename to resources/src/mediawiki.misc-authed-ooui/special.pageLanguage.js -- 2.20.1