mirror of
https://github.com/the-djmaze/snappymail.git
synced 2024-09-20 15:45:55 +08:00
Merge remote-tracking branch 'origin/master' into addressbook
This commit is contained in:
commit
c162a3acc6
|
@ -1,6 +1,5 @@
|
|||
import { koArrayWithDestroy } from 'External/ko';
|
||||
|
||||
import { SaveSettingsStep } from 'Common/Enums';
|
||||
import { ComposeType } from 'Common/EnumsUser';
|
||||
import { registerShortcut } from 'Common/Globals';
|
||||
import { arrayLength, pInt } from 'Common/Utils';
|
||||
|
@ -49,8 +48,6 @@ export class ContactsPopupView extends AbstractViewPopup {
|
|||
|
||||
viewReadOnly: false,
|
||||
|
||||
viewSaveTrigger: SaveSettingsStep.Idle,
|
||||
|
||||
viewSaving: false,
|
||||
|
||||
watchDirty: false,
|
||||
|
@ -190,7 +187,6 @@ export class ContactsPopupView extends AbstractViewPopup {
|
|||
|
||||
saveCommand() {
|
||||
this.viewSaving(true);
|
||||
this.viewSaveTrigger(SaveSettingsStep.Animate);
|
||||
|
||||
const
|
||||
contact = this.contact(),
|
||||
|
@ -210,13 +206,8 @@ export class ContactsPopupView extends AbstractViewPopup {
|
|||
res = true;
|
||||
}
|
||||
|
||||
setTimeout(() =>
|
||||
this.viewSaveTrigger(res ? SaveSettingsStep.TrueResult : SaveSettingsStep.FalseResult)
|
||||
, 350);
|
||||
|
||||
if (res) {
|
||||
this.watchDirty(false);
|
||||
setTimeout(() => this.viewSaveTrigger(SaveSettingsStep.Idle), 1000);
|
||||
}
|
||||
}, {
|
||||
RequestUid: requestUid,
|
||||
|
|
Loading…
Reference in a new issue