Merge remote-tracking branch 'origin/master' into addressbook

This commit is contained in:
djmaze 2022-07-22 22:16:45 +02:00
commit c162a3acc6

View file

@ -1,6 +1,5 @@
import { koArrayWithDestroy } from 'External/ko'; import { koArrayWithDestroy } from 'External/ko';
import { SaveSettingsStep } from 'Common/Enums';
import { ComposeType } from 'Common/EnumsUser'; import { ComposeType } from 'Common/EnumsUser';
import { registerShortcut } from 'Common/Globals'; import { registerShortcut } from 'Common/Globals';
import { arrayLength, pInt } from 'Common/Utils'; import { arrayLength, pInt } from 'Common/Utils';
@ -49,8 +48,6 @@ export class ContactsPopupView extends AbstractViewPopup {
viewReadOnly: false, viewReadOnly: false,
viewSaveTrigger: SaveSettingsStep.Idle,
viewSaving: false, viewSaving: false,
watchDirty: false, watchDirty: false,
@ -190,7 +187,6 @@ export class ContactsPopupView extends AbstractViewPopup {
saveCommand() { saveCommand() {
this.viewSaving(true); this.viewSaving(true);
this.viewSaveTrigger(SaveSettingsStep.Animate);
const const
contact = this.contact(), contact = this.contact(),
@ -210,13 +206,8 @@ export class ContactsPopupView extends AbstractViewPopup {
res = true; res = true;
} }
setTimeout(() =>
this.viewSaveTrigger(res ? SaveSettingsStep.TrueResult : SaveSettingsStep.FalseResult)
, 350);
if (res) { if (res) {
this.watchDirty(false); this.watchDirty(false);
setTimeout(() => this.viewSaveTrigger(SaveSettingsStep.Idle), 1000);
} }
}, { }, {
RequestUid: requestUid, RequestUid: requestUid,