Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix theme cached handling

Browse source
This commit is contained in:
the-djmaze 2023-03-17 23:20:42 +01:00
parent b85ed63ff6
commit e30f9854b7
4 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dev/App/Abstract.js
View file

@ -4,7 +4,7 @@ import { logoutLink } from 'Common/Links';
import { i18nToNodes, initOnStartOrLangChange } from 'Common/Translator'; import { i18nToNodes, initOnStartOrLangChange } from 'Common/Translator';
import { LanguageStore } from 'Stores/Language'; import { LanguageStore } from 'Stores/Language';
import { ThemeStore } from 'Stores/Theme'; import { initThemes } from 'Stores/Theme';
import { SelectComponent } from 'Component/Select'; import { SelectComponent } from 'Component/Select';
import { CheckboxComponent } from 'Component/Checkbox'; import { CheckboxComponent } from 'Component/Checkbox';
@ -46,7 +46,7 @@ export class AbstractApp {
initOnStartOrLangChange(); initOnStartOrLangChange();
LanguageStore.populate(); LanguageStore.populate();
ThemeStore.populate(); initThemes();
this.start(); this.start();
} }

4
dev/App/Admin.js
View file

@ -1,7 +1,7 @@
import 'External/ko'; import 'External/ko';
import { Settings, SettingsGet } from 'Common/Globals'; import { Settings, SettingsGet } from 'Common/Globals';
import { ThemeStore } from 'Stores/Theme'; import { initThemes } from 'Stores/Theme';
import Remote from 'Remote/Admin/Fetch'; import Remote from 'Remote/Admin/Fetch';
@ -18,7 +18,7 @@ export class AdminApp extends AbstractApp {
} }
refresh() { refresh() {
ThemeStore.populate(); initThemes();
this.start(); this.start();
} }

5
dev/App/User.js
View file

@ -37,7 +37,7 @@ import { IdentityUserStore } from 'Stores/User/Identity';
import { FolderUserStore } from 'Stores/User/Folder'; import { FolderUserStore } from 'Stores/User/Folder';
import { PgpUserStore } from 'Stores/User/Pgp'; import { PgpUserStore } from 'Stores/User/Pgp';
import { MessagelistUserStore } from 'Stores/User/Messagelist'; import { MessagelistUserStore } from 'Stores/User/Messagelist';
import { ThemeStore, changeTheme } from 'Stores/Theme'; import { ThemeStore, initThemes } from 'Stores/Theme';
import { LanguageStore } from 'Stores/Language'; import { LanguageStore } from 'Stores/Language';
import { MessageUserStore } from 'Stores/User/Message'; import { MessageUserStore } from 'Stores/User/Message';
@ -191,9 +191,8 @@ export class AppUser extends AbstractApp {
} }
refresh() { refresh() {
ThemeStore.populate(); initThemes();
LanguageStore.language(SettingsGet('language')); LanguageStore.language(SettingsGet('language'));
changeTheme(SettingsGet('Theme'));
this.start(); this.start();
} }

30
dev/Stores/Theme.js
View file

@ -19,23 +19,25 @@ export const
fontSansSerif: ko.observable(''), fontSansSerif: ko.observable(''),
fontSerif: ko.observable(''), fontSerif: ko.observable(''),
fontMono: ko.observable(''), fontMono: ko.observable(''),
isMobile: ko.observable(false), isMobile: ko.observable(false)
},
populate: () => { initThemes = () => {
const themes = Settings.app('themes'); const theme = SettingsGet('Theme'),
themes = Settings.app('themes');
ThemeStore.themes(isArray(themes) ? themes : []); ThemeStore.themes(isArray(themes) ? themes : []);
ThemeStore.theme(SettingsGet('Theme')); ThemeStore.theme(theme);
if (!ThemeStore.isMobile()) { changeTheme(theme);
ThemeStore.userBackgroundName(SettingsGet('userBackgroundName')); if (!ThemeStore.isMobile()) {
ThemeStore.userBackgroundHash(SettingsGet('userBackgroundHash')); ThemeStore.userBackgroundName(SettingsGet('userBackgroundName'));
} ThemeStore.userBackgroundHash(SettingsGet('userBackgroundHash'));
ThemeStore.fontSansSerif(SettingsGet('fontSansSerif'));
ThemeStore.fontSerif(SettingsGet('fontSerif'));
ThemeStore.fontMono(SettingsGet('fontMono'));
leftPanelDisabled(ThemeStore.isMobile());
} }
ThemeStore.fontSansSerif(SettingsGet('fontSansSerif'));
ThemeStore.fontSerif(SettingsGet('fontSerif'));
ThemeStore.fontMono(SettingsGet('fontMono'));
leftPanelDisabled(ThemeStore.isMobile());
}, },
changeTheme = (value, themeTrigger = ()=>0) => { changeTheme = (value, themeTrigger = ()=>0) => {