Skip to content

armgit / dashy

Public Imported from GitHub
0

πŸš€ A self-hostable personal dashboard built for you. Includes status-checking, widgets, themes, icon packs, a UI editor and tons more!

:bug: Fixes theme read err

Alicia Sykes0d66e54b596f
diff --git a/src/components/Settings/ThemeSelector.vue b/src/components/Settings/ThemeSelector.vue
index 081caf4c..51e0be9f 100644
--- a/src/components/Settings/ThemeSelector.vue
+++ b/src/components/Settings/ThemeSelector.vue
@@ -106,15 +106,17 @@ export default {
mounted() {
const initialTheme = this.getInitialTheme();
this.selectedTheme = initialTheme;
- // Pass all user custom stylesheets to the themehelper
- const added = Object.keys(this.externalThemes).map(
- name => this.themeHelper.add(name, this.externalThemes[name]),
- );
// Quicker loading, if the theme is local we can apply it immidiatley
if (this.isThemeLocal(initialTheme)) {
this.updateTheme(initialTheme);
+ }
+
// If it's an external stylesheet, then wait for promise to resolve
- } else if (initialTheme !== Defaults.theme) {
+ if (this.externalThemes && Object.entries(this.externalThemes).length > 0) {
+ const added = Object.keys(this.externalThemes).map(
+ name => this.themeHelper.add(name, this.externalThemes[name]),
+ );
+ // Once, added, then apply users initial theme
Promise.all(added).then(() => {
this.updateTheme(initialTheme);
});