StarCitizenTools/mediawiki-skins-Citizen
1
0
Fork 0
mirror of https://github.com/StarCitizenTools/mediawiki-skins-Citizen.git synced 2024-11-28 00:01:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove the unnecessary usage of array_merge

Browse source 
also move skin features out of construct
This commit is contained in:
alistair3149 2021-04-09 13:08:01 -04:00
parent cb8fb498ab
commit fccf312e7e
No known key found for this signature in database
GPG key ID: 94D081060FD3DD9C
2 changed files with 73 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
includes/Partials/Theme.php
View file

@ -55,14 +55,7 @@ final class Theme extends Partial {
$this->out->addHtmlClasses( 'skin-citizen-' . $theme );
// Add styles and scripts module
$options['scripts'] = array_merge(
$options['scripts'],
[ 'skins.citizen.scripts.theme' ]
);
$options['styles'] = array_merge(
$options['styles'],
[ 'skins.citizen.styles.theme' ]
);
$options['scripts'][] = 'skins.citizen.scripts.theme';
$options['styles'][] = 'skins.citizen.styles.theme';
}
}

161
includes/SkinCitizen.php
View file

@ -52,96 +52,8 @@ class SkinCitizen extends SkinMustache {
* @inheritDoc
*/
public function __construct( $options = [] ) {
$skin = $this;
$out = $skin->getOutput();
$title = $out->getTitle();
$metadata = new Metadata( $this );
$skinTheme = new Theme( $this );
$metadata->addMetadata();
// Theme handler
$skinTheme->setSkinTheme( $options );
// Only load in content pages
if ( $title !== null && $title->isContentPage() ) {
// Load Citizen collapsible sections modules if enabled
if ( $this->getConfigValue( 'CitizenEnableCollapsibleSections' ) === true ) {
$options['scripts'] = array_merge(
$options['scripts'],
[ 'skins.citizen.scripts.sections' ]
);
$options['styles'] = array_merge(
$options['styles'],
[
'skins.citizen.styles.sections',
'skins.citizen.icons.sections'
]
);
}
// Load table of content script if ToC presents
if ( $out->isTOCEnabled() ) {
// Add class to body that notifies the page has TOC
$out->addBodyClasses( 'skin-citizen-has-toc' );
// Disabled style condition loading due to pop in
$options['scripts'] = array_merge(
$options['scripts'],
[ 'skins.citizen.scripts.toc' ]
);
}
}
// Load Citizen search suggestion styles if enabled
if ( $this->getConfigValue( 'CitizenEnableSearch' ) === true ) {
$options['styles'] = array_merge(
$options['styles'],
[
'skins.citizen.styles.search',
'skins.citizen.icons.search'
]
);
}
// Load Citizen image lazyload modules if enabled
if ( $this->getConfigValue( 'CitizenEnableLazyload' ) === true ) {
$options['scripts'] = array_merge(
$options['scripts'],
[ 'skins.citizen.scripts.lazyload' ]
);
$options['styles'] = array_merge(
$options['styles'],
[ 'skins.citizen.styles.lazyload' ]
);
}
// Load Citizen Drawer SiteStats module if enabled
if ( $this->getConfigValue( 'CitizenEnableDrawerSiteStats' ) === true ) {
$options['styles'] = array_merge(
$options['styles'],
[ 'skins.citizen.styles.sitestats' ]
);
}
// Load Citizen Drawer SubSearch module if enabled
if ( $this->getConfigValue( 'CitizenEnableDrawerSubSearch' ) === true ) {
$options['scripts'] = array_merge(
$options['scripts'],
[ 'skins.citizen.scripts.drawer' ]
);
}
// Load Citizen debug module if debug is enabled
if (
$this->getConfigValue( 'ShowDebug' ) === true
|| $this->getConfigValue( 'ShowExceptionDetails' ) === true
) {
$options['styles'] = array_merge(
$options['styles'],
[ 'skins.citizen.styles.debug' ]
);
}
// Add skin-specific features
$this->buildSkinFeatures( $options );
$options['templateDirectory'] = dirname( __DIR__, 1 ) . '/templates';
parent::__construct( $options );
@ -315,4 +227,73 @@ class SkinCitizen extends SkinMustache {
return $urls;
}
/**
* Set up optional skin features
*
* @param array &$options
*/
private function buildSkinFeatures( array &$options ) {
$out = $this->getOutput();
$title = $out->getTitle();
$metadata = new Metadata( $this );
$skinTheme = new Theme( $this );
// Add metadata
$metadata->addMetadata();
// Add theme handler
$skinTheme->setSkinTheme( $options );
// Collapsible sections
// Load in content pages
if ( $title !== null && $title->isContentPage() ) {
// Load Citizen collapsible sections modules if enabled
if ( $this->getConfigValue( 'CitizenEnableCollapsibleSections' ) === true ) {
$options['scripts'][] = 'skins.citizen.scripts.sections';
$options['styles'][] = 'skins.citizen.styles.sections';
$options['styles'][] = 'skins.citizen.icons.sections';
}
// Table of content highlight
// Load if ToC presents
if ( $out->isTOCEnabled() ) {
// Add class to body that notifies the page has TOC
$out->addBodyClasses( 'skin-citizen-has-toc' );
// Disabled style condition loading due to pop in
$options['scripts'][] = 'skins.citizen.scripts.toc';
}
}
// Search suggestion
if ( $this->getConfigValue( 'CitizenEnableSearch' ) === true ) {
$options['styles'][] = 'skins.citizen.styles.search';
$options['styles'][] = 'skins.citizen.icons.search';
}
// Image lazyload
if ( $this->getConfigValue( 'CitizenEnableLazyload' ) === true ) {
$options['scripts'][] = 'skins.citizen.scripts.lazyload';
$options['styles'][] = 'skins.citizen.styles.lazyload';
}
// Drawer sitestats
if ( $this->getConfigValue( 'CitizenEnableDrawerSiteStats' ) === true ) {
$options['styles'][] = 'skins.citizen.styles.sitestats';
}
// Drawer subsearch
if ( $this->getConfigValue( 'CitizenEnableDrawerSubSearch' ) === true ) {
$options['scripts'][] = 'skins.citizen.scripts.drawer';
}
// Debug styles
if (
$this->getConfigValue( 'ShowDebug' ) === true
|| $this->getConfigValue( 'ShowExceptionDetails' ) === true
) {
$options['styles'][] = 'skins.citizen.styles.debug';
}
}
}