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

A lot small fixes

Browse source
This commit is contained in:
RainLoop Team 2015-06-04 22:02:31 +04:00
parent 4457cdbc23
commit 09334159c2
38 changed files with 1496 additions and 239 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dev/App/Admin.js
View file

@ -7,7 +7,7 @@
window = require('window'),
_ = require('_'),
ko = require('ko'),
SimplePace = require('SimplePace'),
progressJs = require('progressJs'),
Enums = require('Common/Enums'),
Utils = require('Common/Utils'),
@ -208,7 +208,7 @@
Remote.licensing(function (sResult, oData) {
LicenseStore.licensingProcess(false);
if (Enums.StorageResultType.Success === sResult && oData && oData.Result && Utils.isNormal(oData.Result['Expired']))
{
LicenseStore.licenseValid(true);
@ -280,9 +280,9 @@
}
}
if (SimplePace)
if (progressJs)
{
SimplePace.set(100);
progressJs().end();
}
};

15
dev/App/User.js
View file

@ -7,7 +7,7 @@
window = require('window'),
_ = require('_'),
$ = require('$'),
SimplePace = require('SimplePace'),
progressJs = require('progressJs'),
Tinycon = require('Tinycon'),
Enums = require('Common/Enums'),
@ -255,6 +255,7 @@
{
var
self = this,
sTrashFolder = FolderStore.trashFolder(),
sSpamFolder = FolderStore.spamFolder()
;
@ -262,11 +263,12 @@
var
bSpam = sSpamFolder === oItem['To'],
bTrash = sTrashFolder === oItem['To'],
bHam = !bSpam && sSpamFolder === oItem['From'] && Cache.getFolderInboxName() === oItem['To']
;
Remote.messagesMove(self.moveOrDeleteResponseHelper, oItem['From'], oItem['To'], oItem['Uid'],
bSpam ? 'SPAM' : (bHam ? 'HAM' : ''));
bSpam ? 'SPAM' : (bHam ? 'HAM' : ''), bSpam || bTrash);
});
this.oMoveCache = {};
@ -1305,9 +1307,9 @@
{
kn.hideLoading();
if (SimplePace)
if (progressJs)
{
SimplePace.set(100);
progressJs().end();
}
};
@ -1332,10 +1334,9 @@
bTwitter = Settings.settingsGet('AllowTwitterSocial')
;
if (SimplePace)
if (progressJs)
{
SimplePace.set(70);
SimplePace.sleep();
progressJs().set(70);
}
Globals.leftPanelDisabled.subscribe(function (bValue) {