mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-30 20:49:20 +03:00
Restructure Capa
This commit is contained in:
parent
5990addfef
commit
e7c7b8ed53
15 changed files with 74 additions and 140 deletions
|
|
@ -4,7 +4,7 @@ import { SaveSettingsStep, UploadErrorCode, Capa } from 'Common/Enums';
|
|||
import { changeTheme, convertThemeName } from 'Common/Utils';
|
||||
import { themePreviewLink, serverRequest } from 'Common/Links';
|
||||
import { i18n } from 'Common/Translator';
|
||||
import { Settings } from 'Common/Globals';
|
||||
import { SettingsCapa } from 'Common/Globals';
|
||||
|
||||
import { ThemeStore } from 'Stores/Theme';
|
||||
|
||||
|
|
@ -26,10 +26,9 @@ export class ThemesUserSettings /*extends AbstractViewSettings*/ {
|
|||
this.themes = ThemeStore.themes;
|
||||
this.themesObjects = ko.observableArray();
|
||||
|
||||
themeBackground.enabled = SettingsCapa(Capa.UserBackground);
|
||||
this.background = themeBackground;
|
||||
|
||||
this.capaUserBackground = Settings.capa(Capa.UserBackground);
|
||||
|
||||
this.themeTrigger = ko.observable(SaveSettingsStep.Idle).extend({ debounce: 100 });
|
||||
|
||||
ThemeStore.theme.subscribe(value => {
|
||||
|
|
@ -59,7 +58,7 @@ export class ThemesUserSettings /*extends AbstractViewSettings*/ {
|
|||
|
||||
// initUploader
|
||||
|
||||
if (themeBackground.uploaderButton() && this.capaUserBackground) {
|
||||
if (themeBackground.uploaderButton() && themeBackground.enabled) {
|
||||
const oJua = new Jua({
|
||||
action: serverRequest('UploadBackground'),
|
||||
limit: 1,
|
||||
|
|
@ -112,7 +111,7 @@ export class ThemesUserSettings /*extends AbstractViewSettings*/ {
|
|||
}
|
||||
|
||||
clearBackground() {
|
||||
if (this.capaUserBackground) {
|
||||
if (themeBackground.enabled) {
|
||||
Remote.request('ClearUserBackground', () => {
|
||||
themeBackground.name('');
|
||||
themeBackground.hash('');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue