Skip to content

Commit

Permalink
dashboard: Fix dark theme detection
Browse files Browse the repository at this point in the history
When system default color theme is selected for theming,
the enabledThemes array is empty or just contains one entry 'default',
in this case the color theme has to be retrieved from the browser.

Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
  • Loading branch information
susnux authored and nextcloud-command committed Jul 26, 2022
1 parent 7615536 commit 800f6b3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions apps/dashboard/src/helpers/getBackgroundUrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ import { generateUrl } from '@nextcloud/router'
import prefixWithBaseUrl from './prefixWithBaseUrl'

export default (background, time = 0, themingDefaultBackground = '') => {
const enabledThemes = window.OCA.Theming.enabledThemes
const isDarkTheme = enabledThemes.join('').indexOf('dark') !== -1
const enabledThemes = window.OCA?.Theming?.enabledThemes || []
const isDarkTheme = (enabledThemes.length === 0 || enabledThemes[0] === 'default')
? window.matchMedia('(prefers-color-scheme: dark)').matches
: enabledThemes.join('').indexOf('dark') !== -1

if (background === 'default') {
if (themingDefaultBackground && themingDefaultBackground !== 'backgroundColor') {
Expand Down
Loading

0 comments on commit 800f6b3

Please sign in to comment.