Mirrors/super-productivity
1
0
Fork 0
mirror of https://github.com/johannesjo/super-productivity.git synced 2026-07-29 02:30:03 +00:00
Code Issues Projects Releases Wiki Activity

fix: dark theme being unset after toggling theme settings

Browse source
This commit is contained in:
Johannes Millan 2018-03-20 21:48:36 +01:00
parent 67fb8bf0d0
commit 06da8b9077
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app-src/scripts/settings/theme-settings/theme-settings-d.js
View file

@ -37,12 +37,14 @@
function cleanupThemeVars() {
// wait for var to be there
$scope.$evalAsync(() => {
vm.currentTheme = vm.currentTheme || DEFAULT_THEME;
vm.isDarkTheme = vm.currentTheme && vm.currentTheme.indexOf('dark') > -1;
vm.selectedTheme = vm.currentTheme && vm.currentTheme
.replace('-theme', '')
.replace('-dark', '');
console.log(vm.currentTheme, vm.isDarkTheme);
});
}
@ -56,7 +58,7 @@
if (value) {
if (vm.isDarkTheme) {
vm.currentTheme = value + '-dark';
} else {
} else if (vm.isDarkTheme === false) {
vm.currentTheme = value + '-theme';
}
@ -75,7 +77,7 @@
$rootScope.r.bodyClass = 'dark-theme';
}
}
} else {
} else if (value === false) {
vm.currentTheme = vm.currentTheme.replace('-dark', '-theme');
if (vm.isCurrentProjectTheme) {
if (!vm.isBoxed) {
@ -104,6 +106,8 @@
});
$scope.$on('$destroy', () => {
console.log('DESTROY');
// remove watchers manually
_.each(watchers, (watcher) => {
watcher();