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

Small fixes

Browse source
This commit is contained in:
RainLoop Team 2015-04-29 00:51:20 +04:00
parent 86295f6e5b
commit 2ac2168477
33 changed files with 51 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dev/Model/Folder.js
View file

@ -285,8 +285,7 @@
});
this.hasUnreadMessages = ko.computed(function () {
return 0 < this.messageCountUnread() &&
(this.isSystemFolder() || this.checkable());
return 0 < this.messageCountUnread();
}, this);
this.hasSubScribedUnreadMessagesSubfolders = ko.computed(function () {

19
dev/Promises/AbstractAjax.js
View file

@ -12,6 +12,7 @@
Enums = require('Common/Enums'),
Utils = require('Common/Utils'),
Links = require('Common/Links'),
Plugins = require('Common/Plugins'),
Settings = require('Storage/Settings'),
@ -71,6 +72,8 @@
oParameters['XToken'] = Settings.settingsGet('Token');
}
Plugins.runHook('ajax-default-request', [sAction, oParameters, sAdditionalGetString]);
this.setTrigger(fTrigger, true);
oH = $.ajax({
@ -83,12 +86,26 @@
'global': true
}).always(function (oData, sTextStatus) {
var bCached = false;
var bCached = false, sType = Enums.StorageResultType.Error;
if (oData && oData['Time'])
{
bCached = Utils.pInt(oData['Time']) > Utils.microtime() - iStart;
}
// backward capability
switch (true)
{
case 'success' === sTextStatus && oData && oData.Result && sAction === oData.Action:
sType = Enums.StorageResultType.Success;
break;
case 'abort' === sTextStatus && (!oData || !oData.__aborted__):
sType = Enums.StorageResultType.Abort;
break;
}
Plugins.runHook('ajax-default-response', [sAction,
Enums.StorageResultType.Success === sType ? oData : null, sType, bCached, oParameters]);
if ('success' === sTextStatus)
{
if (oData && oData.Result && sAction === oData.Action)

2
dev/Settings/User/Folders.js
View file

@ -108,7 +108,7 @@
self.folderListHelp(Translator.i18n('SETTINGS_FOLDERS/HELP_SHOW_HIDE_FOLDER'));
})
.on('mouseover', '.check-folder-parent', function () {
self.folderListHelp(Translator.i18n('SETTINGS_FOLDERS/HELP_SHOW_HIDE_FOLDER_COUNT'));
self.folderListHelp(Translator.i18n('SETTINGS_FOLDERS/HELP_CHECK_FOR_NEW_MESSAGES'));
})
.on('mouseout', '.subscribe-folder-parent, .check-folder-parent, .delete-folder-parent', function () {
self.folderListHelp('');

2
dev/Styles/Animations.less
View file

@ -10,7 +10,7 @@
}
@keyframes bounce-me {
0% { transform: scale(1); } 50% { transform: scale(1.1); } 100% { transform: scale(1); }
0% { transform: scale(1); } 50% { transform: scale(1.2); } 100% { transform: scale(1); }
}
@keyframes textLoadingAnimationKeyFrame {