Merge pull request #23 from koyama-tagbangers

philwebb · philwebb · commit 6ce63903637e · 2021-06-09T23:00:00.000-07:00
* pr/23: Polish 'Fix dark scheme detect function' Fix dark scheme detect function Closes gh-23
diff --git a/src/main/js/setup/switchtheme.js b/src/main/js/setup/switchtheme.js
@@ -46,7 +46,8 @@
   }
 
   function isInitialThemeDark() {
-    return loadTheme() === "dark" || prefersDarkColorScheme.matches;
+    const theme = loadTheme();
+    return theme ? theme === "dark" : prefersDarkColorScheme.matches;
   }
 
   function onThemeChange() {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`function isInitialThemeDark() {`
`49`		`- return loadTheme() === "dark" \|\| prefersDarkColorScheme.matches;`
	`49`	`+ const theme = loadTheme();`
	`50`	`+ return theme ? theme === "dark" : prefersDarkColorScheme.matches;`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`function onThemeChange() {`