Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-31 04:59:21 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renamed SaveSettingsStep to more logical SaveSettingStatus

Browse source
This commit is contained in:
the-djmaze 2022-09-26 14:02:30 +02:00
parent 0864d306d6
commit 118558cdfd
8 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dev/Settings/Admin/General.js
View file

@ -8,7 +8,7 @@ import {
import { addObservablesTo, addSubscribablesTo, addComputablesTo } from 'External/ko';
import { SaveSettingsStep } from 'Common/Enums';
import { SaveSettingStatus } from 'Common/Enums';
import { Settings, SettingsGet, SettingsCapa } from 'Common/Globals';
import { translatorReload, convertLangName } from 'Common/Translator';
@ -38,8 +38,8 @@ export class AdminSettingsGeneral extends AbstractViewSettings {
this.addSettings(['AllowLanguagesOnSettings','NewMoveToFolder']);
addObservablesTo(this, {
attachmentLimitTrigger: SaveSettingsStep.Idle,
themeTrigger: SaveSettingsStep.Idle,
attachmentLimitTrigger: SaveSettingStatus.Idle,
themeTrigger: SaveSettingStatus.Idle,
capaThemes: SettingsCapa('Themes'),
capaUserBackground: SettingsCapa('UserBackground'),
capaAdditionalAccounts: SettingsCapa('AdditionalAccounts'),
@ -82,19 +82,19 @@ export class AdminSettingsGeneral extends AbstractViewSettings {
languageAdminFullName: () => convertLangName(this.languageAdmin())
});
this.languageAdminTrigger = ko.observable(SaveSettingsStep.Idle).extend({ debounce: 100 });
this.languageAdminTrigger = ko.observable(SaveSettingStatus.Idle).extend({ debounce: 100 });
const fReloadLanguageHelper = (saveSettingsStep) => () => {
this.languageAdminTrigger(saveSettingsStep);
setTimeout(() => this.languageAdminTrigger(SaveSettingsStep.Idle), 1000);
setTimeout(() => this.languageAdminTrigger(SaveSettingStatus.Idle), 1000);
},
fSaveHelper = key => value => Remote.saveSetting(key, value);
addSubscribablesTo(this, {
languageAdmin: value => {
this.languageAdminTrigger(SaveSettingsStep.Animate);
this.languageAdminTrigger(SaveSettingStatus.Saving);
translatorReload(true, value)
.then(fReloadLanguageHelper(SaveSettingsStep.TrueResult), fReloadLanguageHelper(SaveSettingsStep.FalseResult))
.then(fReloadLanguageHelper(SaveSettingStatus.Success), fReloadLanguageHelper(SaveSettingStatus.Failed))
.then(() => Remote.saveSetting('LanguageAdmin', value));
},

10
dev/Settings/User/General.js
View file

@ -1,7 +1,7 @@
import ko from 'ko';
import { SMAudio } from 'Common/Audio';
import { SaveSettingsStep } from 'Common/Enums';
import { SaveSettingStatus } from 'Common/Enums';
import { EditorDefaultType, Layout } from 'Common/EnumsUser';
import { Settings, SettingsGet } from 'Common/Globals';
import { isArray } from 'Common/Utils';
@ -48,7 +48,7 @@ export class UserSettingsGeneral extends AbstractViewSettings {
this.allowLanguagesOnSettings = !!SettingsGet('AllowLanguagesOnSettings');
this.languageTrigger = ko.observable(SaveSettingsStep.Idle);
this.languageTrigger = ko.observable(SaveSettingStatus.Idle);
this.identities = IdentityUserStore;
@ -103,14 +103,14 @@ export class UserSettingsGeneral extends AbstractViewSettings {
const fReloadLanguageHelper = (saveSettingsStep) => () => {
this.languageTrigger(saveSettingsStep);
setTimeout(() => this.languageTrigger(SaveSettingsStep.Idle), 1000);
setTimeout(() => this.languageTrigger(SaveSettingStatus.Idle), 1000);
};
addSubscribablesTo(this, {
language: value => {
this.languageTrigger(SaveSettingsStep.Animate);
this.languageTrigger(SaveSettingStatus.Saving);
translatorReload(false, value)
.then(fReloadLanguageHelper(SaveSettingsStep.TrueResult), fReloadLanguageHelper(SaveSettingsStep.FalseResult))
.then(fReloadLanguageHelper(SaveSettingStatus.Success), fReloadLanguageHelper(SaveSettingStatus.Failed))
.then(() => Remote.saveSetting('Language', value));
},

4
dev/Settings/User/Themes.js
View file

@ -1,6 +1,6 @@
import { addObservablesTo } from 'External/ko';
import { SaveSettingsStep, UploadErrorCode } from 'Common/Enums';
import { SaveSettingStatus, UploadErrorCode } from 'Common/Enums';
import { changeTheme, convertThemeName } from 'Common/Utils';
import { themePreviewLink, serverRequest } from 'Common/Links';
import { i18n } from 'Common/Translator';
@ -29,7 +29,7 @@ export class UserSettingsThemes /*extends AbstractViewSettings*/ {
themeBackground.enabled = SettingsCapa('UserBackground');
this.background = themeBackground;
this.themeTrigger = ko.observable(SaveSettingsStep.Idle).extend({ debounce: 100 });
this.themeTrigger = ko.observable(SaveSettingStatus.Idle).extend({ debounce: 100 });
ThemeStore.theme.subscribe(value => {
this.themesObjects.forEach(theme => {