Signature builder small changes

This commit is contained in:
RainLoop Team 2015-02-16 05:21:18 +04:00
parent 5584c5037f
commit 4c6fd9cdd1
6 changed files with 19 additions and 22 deletions

View file

@ -9,7 +9,6 @@
ko = require('ko'),
Enums = require('Common/Enums'),
Translator = require('Common/Translator'),
Links = require('Common/Links'),
AccountStore = require('Stores/User/Account'),
@ -26,14 +25,6 @@
this.accounts = AccountStore.accounts;
this.identities = IdentityStore.identities;
this.processText = ko.computed(function () {
return AccountStore.accounts.loading() ? Translator.i18n('SETTINGS_ACCOUNTS/LOADING_PROCESS') : '';
}, this);
this.visibility = ko.computed(function () {
return '' === this.processText() ? 'hidden' : 'visible';
}, this);
this.accountForDeletion = ko.observable(null).deleteAccessHelper();
this.identityForDeletion = ko.observable(null).deleteAccessHelper();
}

View file

@ -1131,8 +1131,8 @@
'EMAIL': sFrom
});
sText = '<br />' + sReplyTitle + ':' +
'<blockquote><p>' + sText + '</p></blockquote>';
sText = '<br /><br />' + sReplyTitle + ':' +
'<blockquote><p>' + Utils.trim(sText) + '</p></blockquote>';
break;
@ -1146,7 +1146,7 @@
(0 < sCc.length ? '<br />' + Translator.i18n('COMPOSE/FORWARD_MESSAGE_TOP_CC') + ': ' + sCc : '') +
'<br />' + Translator.i18n('COMPOSE/FORWARD_MESSAGE_TOP_SENT') + ': ' + Utils.encodeHtml(sDate) +
'<br />' + Translator.i18n('COMPOSE/FORWARD_MESSAGE_TOP_SUBJECT') + ': ' + Utils.encodeHtml(sSubject) +
'<br /><br />' + sText;
'<br /><br />' + Utils.trim(sText) + '<br /><br />';
break;
case Enums.ComposeType.ForwardAsAttachment:
sText = '';