jenkins-bot has submitted this change and it was merged.
Change subject: Use mediawiki.ui.button when mw-ui-button is used
......................................................................
Use mediawiki.ui.button when mw-ui-button is used
* 9e4e58bce8d10f65cf298b39f48e86c41b6a82b8 separated mediawiki.ui.button
into a separate module (for modularity, and potentially to allow
wiki content to use mw.ui buttons by default in the future).
* Currently, the button code is in both mediawiki.ui and
mediawiki.ui.button for backwards compatibility. However, it will be
removed from mediawiki.ui when existing uses transition over.
* The only mw.ui feature used is buttons, so this uses
mediawiki.ui.button.
Change-Id: I719714bae9b2fab1f4df355eb92132a24eeceee4
---
M Hooks.php
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Hooks.php b/Hooks.php
index 0f55ef8..91fbcb7 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -198,7 +198,7 @@
* one or two buttons.
*/
protected static function addReturnToModules( &$out, &$skin ) {
- $out->addModuleStyles( 'mediawiki.ui' );
+ $out->addModuleStyles( 'mediawiki.ui.button' );
$out->addModules( 'ext.gettingstarted.return' );
}
@@ -299,9 +299,10 @@
}
if ( self::shouldLoadToolbar( $out, $user ) ) {
- // Styles are added separately so they load without
needing JS
+ // Uses addModuleStyles since no-JS code must load it
this way
+ // and this avoids double-loading.
$out->addModuleStyles( array(
- 'mediawiki.ui',
+ 'mediawiki.ui.button',
) );
$out->addModules( array(
'ext.guidedTour.tour.gettingstartedtasktoolbarintro',
--
To view, visit https://gerrit.wikimedia.org/r/111341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I719714bae9b2fab1f4df355eb92132a24eeceee4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Phuedx <[email protected]>
Gerrit-Reviewer: Swalling <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
