From ad0b79db530b131d94eede33240eeadab6484358 Mon Sep 17 00:00:00 2001 From: Thalia Date: Thu, 3 Jan 2019 19:04:48 +0000 Subject: [PATCH] Always load styles for Special:Block page Load the styles regardless of whether the user has JavaScript. Bug: T212880 Change-Id: If103aebd1ca1368ddee7322bf52f7d9d35bd950c --- includes/specials/SpecialBlock.php | 5 ++++- resources/Resources.php | 2 +- .../block.less} | 0 3 files changed, 5 insertions(+), 2 deletions(-) rename resources/src/{mediawiki.special.block.less => mediawiki.special/block.less} (100%) diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php index c9ce2b0837..6a21e8544d 100644 --- a/includes/specials/SpecialBlock.php +++ b/includes/specials/SpecialBlock.php @@ -394,7 +394,10 @@ class SpecialBlock extends FormSpecialPage { * @return string */ protected function preText() { - $this->getOutput()->addModuleStyles( 'mediawiki.widgets.TagMultiselectWidget.styles' ); + $this->getOutput()->addModuleStyles( [ + 'mediawiki.widgets.TagMultiselectWidget.styles', + 'mediawiki.special', + ] ); $this->getOutput()->addModules( [ 'mediawiki.special.block' ] ); $blockCIDRLimit = $this->getConfig()->get( 'BlockCIDRLimit' ); diff --git a/resources/Resources.php b/resources/Resources.php index c8daad67ba..767f6de2bc 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1987,6 +1987,7 @@ return [ 'resources/src/mediawiki.special/upload.css', 'resources/src/mediawiki.special/userrights.css', 'resources/src/mediawiki.special/watchlist.css', + 'resources/src/mediawiki.special/block.less' ], 'targets' => [ 'desktop', 'mobile' ], ], @@ -2065,7 +2066,6 @@ return [ ], 'mediawiki.special.block' => [ 'scripts' => 'resources/src/mediawiki.special.block.js', - 'styles' => 'resources/src/mediawiki.special.block.less', 'dependencies' => [ 'oojs-ui-core', 'oojs-ui.styles.icons-editing-core', diff --git a/resources/src/mediawiki.special.block.less b/resources/src/mediawiki.special/block.less similarity index 100% rename from resources/src/mediawiki.special.block.less rename to resources/src/mediawiki.special/block.less -- 2.20.1