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

Added individual signatures for every identity.

Browse source
This commit is contained in:
RainLoop Team 2015-02-08 05:11:13 +04:00
parent 996703311b
commit 1119022916
45 changed files with 1353 additions and 337 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,8 @@
{
AbstractView.call(this, 'Popups', 'PopupsIdentity');
var self = this;
this.id = '';
this.edit = ko.observable(false);
this.owner = ko.observable(false);
@ -43,16 +45,32 @@
this.bcc.focused = ko.observable(false);
this.signature = ko.observable('');
this.signatureInsertBefore = ko.observable(false);
// this.email.subscribe(function () {
// this.email.hasError(false);
// }, this);
this.showBcc = ko.observable(false);
this.showReplyTo = ko.observable(false);
this.submitRequest = ko.observable(false);
this.submitError = ko.observable('');
this.bcc.subscribe(function (aValue) {
if (false === self.showBcc() && 0 < aValue.length)
{
self.showBcc(true);
}
}, this);
this.replyTo.subscribe(function (aValue) {
if (false === self.showReplyTo() && 0 < aValue.length)
{
self.showReplyTo(true);
}
}, this);
this.addOrEditIdentityCommand = Utils.createCommand(this, function () {
this.populateSignatureFromEditor();
if (!this.email.hasError())
{
this.email.hasError('' === Utils.trim(this.email()));
@ -102,7 +120,8 @@
this.submitError(Translator.getNotification(Enums.Notification.UnknownError));
}
}, this), this.id, this.email(), this.name(), this.replyTo(), this.bcc());
}, this), this.id, this.email(), this.name(), this.replyTo(), this.bcc(),
this.signature(), this.signatureInsertBefore());
return true;
@ -126,17 +145,22 @@
this.email('');
this.replyTo('');
this.bcc('');
this.signature('');
this.signatureInsertBefore(false);
this.email.hasError(false);
this.replyTo.hasError(false);
this.bcc.hasError(false);
this.showBcc(false);
this.showReplyTo(false);
this.submitRequest(false);
this.submitError('');
if (this.editor)
{
this.editor.clear(false);
this.editor.setPlain('', false);
}
};
@ -156,6 +180,8 @@
this.email(oIdentity.email());
this.replyTo(oIdentity.replyTo());
this.bcc(oIdentity.bcc());
this.signature(oIdentity.signature());
this.signatureInsertBefore(oIdentity.signatureInsertBefore());
this.owner(this.id === '');
}
@ -185,15 +211,23 @@
}
};
IdentityPopupView.prototype.populateSignatureFromEditor = function ()
{
if (this.editor)
{
this.signature(
(this.editor.isHtml() ? ':HTML:' : '') + this.editor.getData()
);
}
};
IdentityPopupView.prototype.onFocus = function ()
{
if (!this.editor && this.signatureDom())
{
var self = this;
this.editor = new HtmlEditor(self.signatureDom(), function () {
self.signature(
(self.editor.isHtml() ? ':HTML:' : '') + self.editor.getData()
);
self.populateSignatureFromEditor();
}, function () {
self.setSignature(self.signature());
});