From 99cf6eb5bed7dcd4d33efe4e4cd0bceb4110edb7 Mon Sep 17 00:00:00 2001 From: jdlrobson Date: Tue, 14 Dec 2021 13:59:16 -0800 Subject: [PATCH] Restore gadget support to new internal skins For vector-2022 skin: * MediaWiki:Vector.css and MediaWiki:Vector.js are added via the existing ResourceLoader hook. * User:/vector.js and User:/vector.css are added via new VectorResourceLoader modules Bug: T297758 Change-Id: I37e9a9d353695502213c7a651530995252d9505f --- includes/Hooks.php | 43 +++++++++++++++++++ .../VectorResourceLoaderUserModule.php | 25 +++++++++++ .../VectorResourceLoaderUserStylesModule.php | 25 +++++++++++ includes/SkinVector22.php | 2 + skin.json | 9 ++++ 5 files changed, 104 insertions(+) create mode 100644 includes/ResourceLoader/VectorResourceLoaderUserModule.php create mode 100644 includes/ResourceLoader/VectorResourceLoaderUserStylesModule.php diff --git a/includes/Hooks.php b/includes/Hooks.php index 3a7e950..d5badca 100644 --- a/includes/Hooks.php +++ b/includes/Hooks.php @@ -430,6 +430,30 @@ class Hooks { } } + /** + * Adds MediaWiki:Vector.css as the skin style that controls classic Vector. + * + * @param string $skin + * @param array &$pages + */ + public static function onResourceLoaderSiteStylesModulePages( string $skin, array &$pages ) { + if ( $skin === Constants::SKIN_NAME_MODERN ) { + $pages['MediaWiki:Vector.css'] = [ 'type' => 'style' ]; + } + } + + /** + * Adds MediaWiki:Vector.css as the skin style that controls classic Vector. + * + * @param string $skin + * @param array &$pages + */ + public static function onResourceLoaderSiteModulePages( string $skin, array &$pages ) { + if ( $skin === Constants::SKIN_NAME_MODERN ) { + $pages['MediaWiki:Vector.js'] = [ 'type' => 'script' ]; + } + } + /** * Hook executed on user's Special:Preferences form save. This is used to convert the boolean * presentation of skin version to a version string. That is, a single preference change by the @@ -659,6 +683,25 @@ class Hooks { Constants::CONFIG_KEY_DISABLE_SIDEBAR_PERSISTENCE ); } + + // [[phab:T297758]] ensure old Vector is the same as new Vector + // from a user script / gadget point of view. + if ( self::isSkinVersionLegacy() ) { + $vars[ 'skin' ] = 'vector'; + } + } + + /** + * @param array &$vars Array of variables to be added into the output. + * @param string $skin + * @param Config $config + */ + public static function onResourceLoaderGetConfigVars( array &$vars, string $skin, Config $config ) { + // [[phab:T297758]] ensure old Vector is the same as new Vector + // from a user script / gadget point of view. + if ( self::isVectorSkin( $skin ) ) { + $vars['skin'] = 'vector'; + } } /** diff --git a/includes/ResourceLoader/VectorResourceLoaderUserModule.php b/includes/ResourceLoader/VectorResourceLoaderUserModule.php new file mode 100644 index 0000000..edcd580 --- /dev/null +++ b/includes/ResourceLoader/VectorResourceLoaderUserModule.php @@ -0,0 +1,25 @@ +getSkin(); + $config = $this->getConfig(); + $user = $context->getUserObj(); + $pages = []; + if ( $config->get( 'AllowUserCss' ) && !$user->isAnon() && ( $skin === Constants::SKIN_NAME_MODERN ) ) { + $pages = parent::getPages( $context ); + $userPage = $user->getUserPage()->getPrefixedDBkey(); + $pages["$userPage/vector.js"] = [ 'type' => 'script' ]; + } + return $pages; + } +} diff --git a/includes/ResourceLoader/VectorResourceLoaderUserStylesModule.php b/includes/ResourceLoader/VectorResourceLoaderUserStylesModule.php new file mode 100644 index 0000000..2dfff04 --- /dev/null +++ b/includes/ResourceLoader/VectorResourceLoaderUserStylesModule.php @@ -0,0 +1,25 @@ +getSkin(); + $config = $this->getConfig(); + $user = $context->getUserObj(); + $pages = []; + if ( $config->get( 'AllowUserCss' ) && !$user->isAnon() && ( $skin === Constants::SKIN_NAME_MODERN ) ) { + $pages = parent::getPages( $context ); + $userPage = $user->getUserPage()->getPrefixedDBkey(); + $pages["$userPage/vector.css"] = [ 'type' => 'style' ]; + } + return $pages; + } +} diff --git a/includes/SkinVector22.php b/includes/SkinVector22.php index b596f3a..30397cd 100644 --- a/includes/SkinVector22.php +++ b/includes/SkinVector22.php @@ -33,6 +33,7 @@ class SkinVector22 extends SkinVector { */ public static function getScriptsOption() { return [ + 'skins.vector.user', 'skins.vector.js', 'skins.vector.es6', ]; @@ -47,6 +48,7 @@ class SkinVector22 extends SkinVector { return [ 'mediawiki.ui.button', 'skins.vector.styles', + 'skins.vector.user.styles', 'skins.vector.icons', 'mediawiki.ui.icon', ]; diff --git a/skin.json b/skin.json index 38ad9a7..120d6f1 100644 --- a/skin.json +++ b/skin.json @@ -115,6 +115,9 @@ "vector": "GlobalVarConfig::newInstance" }, "Hooks": { + "ResourceLoaderGetConfigVars": "Vector\\Hooks::onResourceLoaderGetConfigVars", + "ResourceLoaderSiteModulePages": "Vector\\Hooks::onResourceLoaderSiteModulePages", + "ResourceLoaderSiteStylesModulePages": "Vector\\Hooks::onResourceLoaderSiteStylesModulePages", "SkinPageReadyConfig": "Vector\\Hooks::onSkinPageReadyConfig", "GetPreferences": "Vector\\Hooks::onGetPreferences", "PreferencesFormPreSave": "Vector\\Hooks::onPreferencesFormPreSave", @@ -124,6 +127,12 @@ }, "@note": "When modifying skins.vector.styles definition, make sure the installer still works", "ResourceModules": { + "skins.vector.user": { + "class": "Vector\\ResourceLoader\\VectorResourceLoaderUserModule" + }, + "skins.vector.user.styles": { + "class": "Vector\\ResourceLoader\\VectorResourceLoaderUserStylesModule" + }, "skins.vector.search": { "dependencies": [ "mediawiki.Uri",