Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 20:19:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved observables

Browse source
This commit is contained in:
djmaze 2020-10-27 11:09:24 +01:00
parent 8d7e25fc7c
commit 7db7d5545b
28 changed files with 236 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

68
dev/View/Popup/Identity.js
View file

@ -1,5 +1,3 @@
import ko from 'ko';
import { StorageResultType, Notification } from 'Common/Enums';
import { getNotification } from 'Common/Translator';
@ -8,14 +6,7 @@ import Remote from 'Remote/User/Fetch';
import { popup, command } from 'Knoin/Knoin';
import { AbstractViewNext } from 'Knoin/AbstractViewNext';
ko.observable.fn.validateEmail = function() {
this.hasError = ko.observable(false);
this.subscribe(value => this.hasError(value && !/^[^@\s]+@[^@\s]+$/.test(value)));
this.valueHasMutated();
return this;
};
const reEmail = /^[^@\s]+@[^@\s]+$/;
@popup({
name: 'View/Popup/Identity',
@ -29,10 +20,20 @@ class IdentityPopupView extends AbstractViewNext {
this.addObservables({
edit: false,
owner: false,
email: '',
emailFocused: false,
emailHasError: false,
name: '',
replyTo: '',
replyToFocused: false,
replyToHasError: false,
bcc: '',
bccFocused: false,
bccHasError: false,
signature: '',
signatureInsertBefore: false,
@ -44,21 +45,26 @@ class IdentityPopupView extends AbstractViewNext {
submitError: ''
});
this.email = ko.observable('').validateEmail();
this.replyTo = ko.observable('').validateEmail();
this.bcc = ko.observable('').validateEmail();
this.bcc.subscribe((value) => {
if (false === this.showBcc() && value.length) {
this.showBcc(true);
}
});
this.replyTo.subscribe((value) => {
if (false === this.showReplyTo() && value.length) {
this.showReplyTo(true);
this.addSubscribables({
email: value => this.emailHasError(value && !reEmail.test(value)),
replyTo: value => {
this.replyToHasError(value && !reEmail.test(value));
if (false === this.showReplyTo() && value.length) {
this.showReplyTo(true);
}
},
bcc: value => {
this.bccHasError(value && !reEmail.test(value));
if (false === this.showBcc() && value.length) {
this.showBcc(true);
}
}
});
/*
this.email.valueHasMutated();
this.replyTo.valueHasMutated();
this.bcc.valueHasMutated();
*/
}
@command((self) => !self.submitRequest())
@ -67,11 +73,11 @@ class IdentityPopupView extends AbstractViewNext {
this.signature.__fetchEditorValue();
}
if (!this.email.hasError()) {
this.email.hasError(!this.email().trim());
if (!this.emailHasError()) {
this.emailHasError(!this.email().trim());
}
if (this.email.hasError()) {
if (this.emailHasError()) {
if (!this.owner()) {
this.emailFocused(true);
}
@ -79,12 +85,12 @@ class IdentityPopupView extends AbstractViewNext {
return false;
}
if (this.replyTo.hasError()) {
if (this.replyToHasError()) {
this.replyToFocused(true);
return false;
}
if (this.bcc.hasError()) {
if (this.bccHasError()) {
this.bccFocused(true);
return false;
}
@ -129,9 +135,9 @@ class IdentityPopupView extends AbstractViewNext {
this.signature('');
this.signatureInsertBefore(false);
this.email.hasError(false);
this.replyTo.hasError(false);
this.bcc.hasError(false);
this.emailHasError(false);
this.replyToHasError(false);
this.bccHasError(false);
this.showBcc(false);
this.showReplyTo(false);

8
dev/View/User/AbstractSystemDropDown.js
View file

@ -1,5 +1,3 @@
import ko from 'ko';
import AppStore from 'Stores/User/App';
import AccountStore from 'Stores/User/Account';
import MessageStore from 'Stores/User/Message';
@ -32,8 +30,10 @@ class AbstractSystemDropDownUserView extends AbstractViewNext {
this.accounts = AccountStore.accounts;
this.accountsUnreadCount = AccountStore.accountsUnreadCount;
this.accountMenuDropdownTrigger = ko.observable(false);
this.capaAdditionalAccounts = ko.observable(Settings.capa(Capa.AdditionalAccounts));
this.addObservables({
accountMenuDropdownTrigger: false,
capaAdditionalAccounts: Settings.capa(Capa.AdditionalAccounts)
});
this.addAccountClick = this.addAccountClick.bind(this);

2
dev/View/User/MailBox/MessageView.js
View file

@ -264,7 +264,7 @@ class MessageViewMailBoxUserView extends AbstractViewNext {
fullScreenMode: value => $htmlCL.toggle('rl-message-fullscreen', value)
});
this.message.viewTrigger.subscribe(() => {
MessageStore.messageViewTrigger.subscribe(() => {
const message = this.message();
message ? this.viewIsFlagged(message.isFlagged()) : this.viewIsFlagged(false);
});