StarCitizenTools/mediawiki-skins-Citizen
1
0
Fork 0
mirror of https://github.com/StarCitizenTools/mediawiki-skins-Citizen.git synced 2024-09-23 10:19:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug: fix changing theme through UPO (#340)

Browse source
This commit is contained in:
H. C. Kruse 2021-04-06 14:40:15 +02:00 committed by GitHub
parent abffe590b5
commit 0e63bb6aef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
includes/Partials/Theme.php
View file

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

13
resources/skins.citizen.scripts.theme/theme-switcher.js
View file

@ -22,6 +22,12 @@
return;
}
try {
if ( window.mw.cookie.get( 'skin-citizen-theme-override' ) === '1' ) {
return;
}
} catch ( e ) {}
theme = window.mw.config.get( 'wgCitizenThemeDefault' );
if ( theme === null ) {
theme = 'auto';
@ -34,15 +40,10 @@
}
if ( theme !== 'auto' ) {
setStorageChangeTheme( theme );
return;
}
try {
if ( window.mw.cookie.get( 'skin-citizen-theme-override' ) === '1' ) {
return;
}
} catch ( e ) {}
prefersColorSchemeDarkQuery = window.matchMedia( '(prefers-color-scheme: dark)' );
theme = 'light';
if ( prefersColorSchemeDarkQuery.matches ) {