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

More fixes for scrutinizer-ci (+ enable php)

Browse source
This commit is contained in:
RainLoop Team 2016-08-09 23:11:54 +03:00
parent 59b32241bf
commit 161ddc9920
5 changed files with 17 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,13 +46,11 @@ function AddOpenPgpKeyPopupView()
return false;
}
var
done = false,
match = null;
var done = false;
do
{
match = reg.exec(keyTrimmed);
var match = reg.exec(keyTrimmed);
if (match && 0 < count)
{
if (match[0] && match[1] && match[2] && match[1] === match[2])

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

@ -1380,13 +1380,9 @@ ComposePopupView.prototype.onBuild = function()
{
this.initUploader();
var
self = this,
oScript = null;
var self = this;
key('ctrl+q, command+q, ctrl+w, command+w', Enums.KeyState.Compose, function() {
return false;
});
key('ctrl+q, command+q, ctrl+w, command+w', Enums.KeyState.Compose, Utils.noopFalse);
key('`', Enums.KeyState.Compose, function() {
if (self.oEditor && !self.oEditor.hasFocus() && !Utils.inFocus())
@ -1437,7 +1433,7 @@ ComposePopupView.prototype.onBuild = function()
if (this.dropboxEnabled() && this.dropboxApiKey() && !window.Dropbox)
{
oScript = window.document.createElement('script');
var oScript = window.document.createElement('script');
oScript.type = 'text/javascript';
oScript.src = 'https://www.dropbox.com/static/api/2/dropins.js';
$(oScript).attr('id', 'dropboxjs').attr('data-app-key', self.dropboxApiKey());
@ -1690,8 +1686,9 @@ ComposePopupView.prototype.initUploader = function()
this.dragAndDropVisible(false);
}, this))
.on('onProgress', _.bind(function(sId, iLoaded, iTotal) {
var oItem = null;
if (Utils.isUnd(oUploadCache[sId]))
var oItem = oUploadCache[sId];
if (!oItem)
{
oItem = this.getAttachmentById(sId);
if (oItem)
@ -1699,10 +1696,6 @@ ComposePopupView.prototype.initUploader = function()
oUploadCache[sId] = oItem;
}
}
else
{
oItem = oUploadCache[sId];
}
if (oItem)
{
@ -1740,10 +1733,8 @@ ComposePopupView.prototype.initUploader = function()
}, this))
.on('onStart', _.bind(function(sId) {
var
oItem = null;
if (Utils.isUnd(oUploadCache[sId]))
var oItem = oUploadCache[sId];
if (!oItem)
{
oItem = this.getAttachmentById(sId);
if (oItem)
@ -1751,10 +1742,6 @@ ComposePopupView.prototype.initUploader = function()
oUploadCache[sId] = oItem;
}
}
else
{
oItem = oUploadCache[sId];
}
if (oItem)
{