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

Sortable accounts list

Browse source
This commit is contained in:
RainLoop Team 2015-01-28 02:16:00 +04:00
parent 965ea317e4
commit b563528be7
10 changed files with 150 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

25
dev/View/Popup/Compose.js
View file

@ -770,22 +770,35 @@
sFrom = Utils.pString(sFrom);
if ('' !== sFrom)
{
sSignature = sSignature.replace(/{{FROM-FULL}}/g, sFrom);
if (-1 === sFrom.indexOf(' ') && 0 < sFrom.indexOf('@'))
{
sFrom = sFrom.replace(/@(.+)$/, '');
}
sSignature = sSignature.replace(/{{FROM}}/g, sFrom);
}
sSignature = sSignature.replace(/[\s]{1,2}{{FROM}}/g, '{{FROM}}');
sSignature = sSignature.replace(/[\s]{1,2}{{FROM-FULL}}/g, '{{FROM-FULL}}');
sSignature = sSignature.replace(/{{FROM}}/g, '');
sSignature = sSignature.replace(/{{DATE}}/g, moment().format('llll'));
sSignature = sSignature.replace(/{{FROM-FULL}}/g, '');
if (sData && Enums.ComposeType.Empty === sComposeType &&
-1 < sSignature.indexOf('{{DATA}}'))
if (-1 < sSignature.indexOf('{{DATE}}'))
{
bData = true;
sSignature = sSignature.replace('{{DATA}}', sData);
sSignature = sSignature.replace(/{{DATE}}/g, moment().format('llll'));
}
sSignature = sSignature.replace(/{{DATA}}/g, '');
if (sData && Enums.ComposeType.Empty === sComposeType &&
-1 < sSignature.indexOf('{{BODY}}'))
{
bData = true;
sSignature = sSignature.replace('{{BODY}}', sData);
}
sSignature = sSignature.replace(/{{BODY}}/g, '');
if (!bHtml)
{

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

@ -12,6 +12,8 @@
Utils = require('Common/Utils'),
Links = require('Common/Links'),
AccountStore = require('Stores/User/Account'),
Settings = require('Storage/Settings'),
Data = require('Storage/User/Data'),
Remote = require('Storage/User/Remote'),
@ -27,9 +29,9 @@
{
AbstractView.call(this, 'Right', 'SystemDropDown');
this.accounts = Data.accounts;
this.accounts = AccountStore.collection;
this.accountEmail = Data.accountEmail;
this.accountsLoading = Data.accountsLoading;
this.accountsLoading = AccountStore.loading;
this.accountMenuDropdownTrigger = ko.observable(false);