From a0edc19f420ea589d3934e62b476b04e768dd5bd Mon Sep 17 00:00:00 2001 From: Matthew Flaschen Date: Wed, 18 Dec 2013 20:23:17 -0500 Subject: [PATCH] Add mediawiki.ui.button to places in core using mw.ui All of these also use other mw.ui features (e.g. mw-ui-vform, mw-ui-input, mw-ui-checkbox-label, etc.), so they can't only depend on mediawiki.ui.button. Change-Id: I6906533753185f7de42552cff38a86fb0171d1d8 --- includes/htmlform/HTMLForm.php | 5 ++++- includes/specials/SpecialSearch.php | 2 +- includes/specials/SpecialUserlogin.php | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php index 5621b01f43..0aea0706ef 100644 --- a/includes/htmlform/HTMLForm.php +++ b/includes/htmlform/HTMLForm.php @@ -700,7 +700,10 @@ class HTMLForm extends ContextSource { $this->getOutput()->preventClickjacking(); $this->getOutput()->addModules( 'mediawiki.htmlform' ); if ( $this->isVForm() ) { - $this->getOutput()->addModuleStyles( 'mediawiki.ui' ); + $this->getOutput()->addModuleStyles( array( + 'mediawiki.ui', + 'mediawiki.ui.button', + ) ); // @todo Should vertical form set setWrapperLegend( false ) // to hide ugly fieldsets? } diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index b6b219f117..8cc262953a 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -87,7 +87,7 @@ class SpecialSearch extends SpecialPage { $out = $this->getOutput(); $out->allowClickjacking(); $out->addModuleStyles( array( - 'mediawiki.special', 'mediawiki.special.search', 'mediawiki.ui' + 'mediawiki.special', 'mediawiki.special.search', 'mediawiki.ui', 'mediawiki.ui.button' ) ); // Strip underscores from title parameter; most of the time we'll want diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php index 3fc5ebbdd7..0866aa7f05 100644 --- a/includes/specials/SpecialUserlogin.php +++ b/includes/specials/SpecialUserlogin.php @@ -1099,7 +1099,8 @@ class LoginForm extends SpecialPage { $out->addModuleStyles( array( 'mediawiki.ui', - 'mediawiki.special.createaccount' + 'mediawiki.ui.button', + 'mediawiki.special.createaccount', ) ); // XXX hack pending RL or JS parse() support for complex content messages // https://bugzilla.wikimedia.org/show_bug.cgi?id=25349 -- 2.20.1