golem
/
VectorGOLEM
9
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge "[refactor] Clean up responsive handling"

This commit is contained in:
jenkins-bot 2021-08-25 16:17:20 +00:00 committed by Gerrit Code Review
parent 6a2f7a5d63 391d9ba509
commit 92e034fbe7
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
includes/SkinVector.php
View File

@ -87,18 +87,6 @@ class SkinVector extends SkinMustache {
$options['styles'] = [ 'skins.vector.styles.legacy' ]; $options['styles'] = [ 'skins.vector.styles.legacy' ];
$options['template'] = 'skin-legacy'; $options['template'] = 'skin-legacy';
} else { } else {
// For historic reasons, the viewport is added when Vector is loaded on the mobile
// domain. This is only possible for 3rd parties or by useskin parameter as there is
// no preference for changing mobile skin.
$responsive = $this->getConfig()->get( 'VectorResponsive' );
if ( ExtensionRegistry::getInstance()->isLoaded( 'MobileFrontend' ) ) {
$mobFrontContext = MediaWikiServices::getInstance()->getService( 'MobileFrontend.Context' );
if ( $mobFrontContext->shouldDisplayMobileView() ) {
$responsive = true;
}
}
$options['responsive'] = $responsive;
if ( $this->shouldConsolidateUserLinks() ) { if ( $this->shouldConsolidateUserLinks() ) {
$options['link'] = [ 'text-wrapper' => [ 'tag' => 'span' ] ]; $options['link'] = [ 'text-wrapper' => [ 'tag' => 'span' ] ];
} }
@ -435,6 +423,24 @@ class SkinVector extends SkinMustache {
return Constants::SEARCH_BOX_INPUT_LOCATION_MOVED; return Constants::SEARCH_BOX_INPUT_LOCATION_MOVED;
} }
/**
* @inheritDoc
*/
public function isResponsive() {
// Check it's enabled by user preference and configuration
$responsive = parent::isResponsive() && $this->getConfig()->get( 'VectorResponsive' );
// For historic reasons, the viewport is added when Vector is loaded on the mobile
// domain. This is only possible for 3rd parties or by useskin parameter as there is
// no preference for changing mobile skin. Only need to check if $responsive is falsey.
if ( !$responsive && ExtensionRegistry::getInstance()->isLoaded( 'MobileFrontend' ) ) {
$mobFrontContext = MediaWikiServices::getInstance()->getService( 'MobileFrontend.Context' );
if ( $mobFrontContext->shouldDisplayMobileView() ) {
return true;
}
}
return $responsive;
}
/** /**
* Determines whether or not the search input should expand when focused * Determines whether or not the search input should expand when focused
* before WVUI search is loaded. In WVUI, the search input expands to * before WVUI search is loaded. In WVUI, the search input expands to

1
skin.json
View File

@ -24,6 +24,7 @@
"scripts": [ "scripts": [
"skins.vector.js" "skins.vector.js"
], ],
"responsive": true,
"styles": [ "styles": [
"mediawiki.ui.button", "mediawiki.ui.button",
"skins.vector.styles", "skins.vector.styles",