wikimedia/mediawiki-skins-Vector
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/Vector.git synced 2024-11-28 09:30:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

SearchBox: Fix data-search-loc attribute

Browse source 
Following on from I0edbd89, set the data-search-loc attribute to
"header-navigation" for legacy Vector.

Bug: T256100
Change-Id: I113c56ac9b18df46ebc13b9985aea03ba82419bd
This commit is contained in:
Sam Smith 2020-09-24 13:46:48 +01:00
parent e7c07665ff
commit 58c1c9ddf5
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
includes/SkinVector.php
View file

@ -128,9 +128,6 @@ class SkinVector extends SkinMustache {
$newTalksHtml = $skin->getNewtalks() ?: null; $newTalksHtml = $skin->getNewtalks() ?: null;
$isSearchInHeader = $featureManager->isFeatureEnabled( Constants::FEATURE_SEARCH_IN_HEADER ); $isSearchInHeader = $featureManager->isFeatureEnabled( Constants::FEATURE_SEARCH_IN_HEADER );
$inputLocation = $isSearchInHeader
? Constants::SEARCH_BOX_INPUT_LOCATION_MOVED
: Constants::SEARCH_BOX_INPUT_LOCATION_DEFAULT;
$commonSkinData = parent::getTemplateData() + [ $commonSkinData = parent::getTemplateData() + [
'page-langcode' => $title->getPageViewLanguage()->getHtmlCode(), 'page-langcode' => $title->getPageViewLanguage()->getHtmlCode(),
@ -145,7 +142,7 @@ class SkinVector extends SkinMustache {
'data-footer' => $this->getFooterData(), 'data-footer' => $this->getFooterData(),
'is-search-in-header' => $isSearchInHeader, 'is-search-in-header' => $isSearchInHeader,
'input-location' => $inputLocation, 'input-location' => $this->getSearchBoxInputLocation( $isSearchInHeader ),
'main-page-href' => $mainPageHref, 'main-page-href' => $mainPageHref,
@ -167,6 +164,23 @@ class SkinVector extends SkinMustache {
return $commonSkinData; return $commonSkinData;
} }
/**
* Gets the value of the "input-location" parameter for the SearchBox Mustache template.
*
* @param bool $isSearchInHeader
* @return string Either `Constants::SEARCH_BOX_INPUT_LOCATION_DEFAULT` or
* `Constants::SEARCH_BOX_INPUT_LOCATION_MOVED`
*/
private function getSearchBoxInputLocation( bool $isSearchInHeader ) : string {
if ( $this->isLegacy() ) {
return Constants::SEARCH_BOX_INPUT_LOCATION_DEFAULT;
}
return $isSearchInHeader
? Constants::SEARCH_BOX_INPUT_LOCATION_MOVED
: Constants::SEARCH_BOX_INPUT_LOCATION_DEFAULT;
}
/** /**
* Get rows that make up the footer * Get rows that make up the footer
* @return array for use in Mustache template describing the footer elements. * @return array for use in Mustache template describing the footer elements.