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

More fixes for scrutinizer-ci

Browse source
This commit is contained in:
RainLoop Team 2016-08-09 22:52:30 +03:00
parent c7e97b78d6
commit 59b32241bf
16 changed files with 116 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

18
dev/View/Popup/AddOpenPgpKey.js
View file

@ -30,27 +30,29 @@ function AddOpenPgpKeyPopupView()
var
count = 30,
match = null,
key = Utils.trim(this.key()),
keyTrimmed = Utils.trim(this.key()),
reg = /[\-]{3,6}BEGIN[\s]PGP[\s](PRIVATE|PUBLIC)[\s]KEY[\s]BLOCK[\-]{3,6}[\s\S]+?[\-]{3,6}END[\s]PGP[\s](PRIVATE|PUBLIC)[\s]KEY[\s]BLOCK[\-]{3,6}/gi,
openpgpKeyring = PgpStore.openpgpKeyring,
done = false;
openpgpKeyring = PgpStore.openpgpKeyring;
if (/[\n]/.test(key))
if (/[\n]/.test(keyTrimmed))
{
key = key.replace(/[\r]+/g, '').replace(/[\n]{2,}/g, '\n\n');
keyTrimmed = keyTrimmed.replace(/[\r]+/g, '').replace(/[\n]{2,}/g, '\n\n');
}
this.key.error('' === key);
this.key.error('' === keyTrimmed);
if (!openpgpKeyring || this.key.error())
{
return false;
}
var
done = false,
match = null;
do
{
match = reg.exec(key);
match = reg.exec(keyTrimmed);
if (match && 0 < count)
{
if (match[0] && match[1] && match[2] && match[1] === match[2])

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

@ -5,7 +5,6 @@ var
$ = require('$'),
ko = require('ko'),
key = require('key'),
JSON = require('JSON'),
Jua = require('Jua'),
Enums = require('Common/Enums'),
@ -1481,7 +1480,7 @@ ComposePopupView.prototype.driveCallback = function(sAccessToken, oData)
if (oRequest && oRequest.responseText)
{
var
oResponse = JSON.parse(oRequest.responseText),
oResponse = window.JSON.parse(oRequest.responseText),
fExport = function(oItem, sMimeType, sExt) {
if (oItem && oItem.exportLinks)
{
@ -1849,12 +1848,10 @@ ComposePopupView.prototype.addMessageAsAttachment = function(oMessage)
{
if (oMessage)
{
var
oAttachment = null,
sTemp = oMessage.subject();
var sTemp = oMessage.subject();
sTemp = '.eml' === sTemp.substr(-4).toLowerCase() ? sTemp : sTemp + '.eml';
oAttachment = new ComposeAttachmentModel(
var oAttachment = new ComposeAttachmentModel(
oMessage.requestHash, sTemp, oMessage.size()
);

14
dev/View/Popup/ComposeOpenPgp.js
View file

@ -87,7 +87,6 @@ function ComposeOpenPgpPopupView()
var
bResult = true,
oPrivateKey = null,
aPrivateKeys = [],
aPublicKeys = [];
this.submitRequest(true);
@ -110,7 +109,7 @@ function ComposeOpenPgpPopupView()
if (bResult)
{
aPrivateKeys = this.signKey().key.getNativeKeys();
var aPrivateKeys = this.signKey().key.getNativeKeys();
oPrivateKey = aPrivateKeys[0] || null;
try
@ -248,22 +247,19 @@ function ComposeOpenPgpPopupView()
var
sKeyId = this.selectedPrivateKey(),
oKey = null,
oOption = sKeyId ? _.find(this.privateKeysOptions(), function(oItem) {
return oItem && sKeyId === oItem.id;
}) : null;
if (oOption)
{
oKey = {
this.signKey({
'empty': !oOption.key,
'selected': ko.observable(!!oOption.key),
'users': oOption.key.users,
'hash': oOption.key.id.substr(-8).toUpperCase(),
'key': oOption.key
};
this.signKey(oKey);
});
}
});
@ -402,7 +398,6 @@ ComposeOpenPgpPopupView.prototype.onShow = function(fCallback, sText, oIdentity,
self = this,
aRec = [],
sEmail = '',
aKeys = [],
oEmail = new EmailModel();
this.resultCallback = fCallback;
@ -433,7 +428,8 @@ ComposeOpenPgpPopupView.prototype.onShow = function(fCallback, sText, oIdentity,
{
sEmail = oIdentity.email();
aRec.unshift(sEmail);
aKeys = PgpStore.findAllPrivateKeysByEmailNotNative(sEmail);
var aKeys = PgpStore.findAllPrivateKeysByEmailNotNative(sEmail);
if (aKeys && aKeys[0])
{
this.signKey({

54
dev/View/Popup/FolderSystem.js
View file

@ -38,45 +38,41 @@ function FolderSystemPopupView()
], null, null, null, null, null, true);
}, this);
var
fSaveSystemFolders = null,
fCallback = null;
this.sentFolder = FolderStore.sentFolder;
this.draftFolder = FolderStore.draftFolder;
this.spamFolder = FolderStore.spamFolder;
this.trashFolder = FolderStore.trashFolder;
this.archiveFolder = FolderStore.archiveFolder;
fSaveSystemFolders = _.debounce(function() {
var
fSaveSystemFolders = _.debounce(function() {
Settings.settingsSet('SentFolder', FolderStore.sentFolder());
Settings.settingsSet('DraftFolder', FolderStore.draftFolder());
Settings.settingsSet('SpamFolder', FolderStore.spamFolder());
Settings.settingsSet('TrashFolder', FolderStore.trashFolder());
Settings.settingsSet('ArchiveFolder', FolderStore.archiveFolder());
Settings.settingsSet('SentFolder', FolderStore.sentFolder());
Settings.settingsSet('DraftFolder', FolderStore.draftFolder());
Settings.settingsSet('SpamFolder', FolderStore.spamFolder());
Settings.settingsSet('TrashFolder', FolderStore.trashFolder());
Settings.settingsSet('ArchiveFolder', FolderStore.archiveFolder());
Remote.saveSystemFolders(Utils.noop, {
'SentFolder': FolderStore.sentFolder(),
'DraftFolder': FolderStore.draftFolder(),
'SpamFolder': FolderStore.spamFolder(),
'TrashFolder': FolderStore.trashFolder(),
'ArchiveFolder': FolderStore.archiveFolder(),
'NullFolder': 'NullFolder'
});
Remote.saveSystemFolders(Utils.noop, {
'SentFolder': FolderStore.sentFolder(),
'DraftFolder': FolderStore.draftFolder(),
'SpamFolder': FolderStore.spamFolder(),
'TrashFolder': FolderStore.trashFolder(),
'ArchiveFolder': FolderStore.archiveFolder(),
'NullFolder': 'NullFolder'
});
}, Enums.Magics.Time1s);
}, Enums.Magics.Time1s);
var
fCallback = function() {
Settings.settingsSet('SentFolder', FolderStore.sentFolder());
Settings.settingsSet('DraftFolder', FolderStore.draftFolder());
Settings.settingsSet('SpamFolder', FolderStore.spamFolder());
Settings.settingsSet('TrashFolder', FolderStore.trashFolder());
Settings.settingsSet('ArchiveFolder', FolderStore.archiveFolder());
fCallback = function() {
Settings.settingsSet('SentFolder', FolderStore.sentFolder());
Settings.settingsSet('DraftFolder', FolderStore.draftFolder());
Settings.settingsSet('SpamFolder', FolderStore.spamFolder());
Settings.settingsSet('TrashFolder', FolderStore.trashFolder());
Settings.settingsSet('ArchiveFolder', FolderStore.archiveFolder());
fSaveSystemFolders();
};
fSaveSystemFolders();
};
FolderStore.sentFolder.subscribe(fCallback);
FolderStore.draftFolder.subscribe(fCallback);

6
dev/View/Popup/MessageOpenPgp.js
View file

@ -39,15 +39,13 @@ function MessageOpenPgpPopupView()
_.delay(_.bind(function() {
var
oPrivateKeys = [],
oPrivateKey = null;
var oPrivateKey = null;
try
{
if (this.resultCallback && this.selectedKey())
{
oPrivateKeys = this.selectedKey().getNativeKeys();
var oPrivateKeys = this.selectedKey().getNativeKeys();
oPrivateKey = oPrivateKeys && oPrivateKeys[0] ? oPrivateKeys[0] : null;
if (oPrivateKey)

8
dev/View/Popup/NewOpenPgpKey.js
View file

@ -58,17 +58,13 @@ function NewOpenPgpKeyPopupView()
_.delay(function() {
var mPromise = false;
try {
mPromise = PgpStore.openpgp.generateKey({
PgpStore.openpgp.generateKey({
userIds: [oUserId],
numBits: Utils.pInt(self.keyBitLength()),
passphrase: Utils.trim(self.password())
});
mPromise.then(function(mKeyPair) {
}).then(function(mKeyPair) {
self.submitRequest(false);