Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +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 {

4
gulpfile.js
View file

@ -570,8 +570,8 @@ gulp.task('owncloud', ['rainloop:owncloud:copy',
//WATCH
gulp.task('watch', ['fast'], function() {
gulp.watch(cfg.paths.globjs, {interval: 500}, ['js:app', 'js:admin']);
gulp.watch(cfg.paths.less.main.watch, {interval: 500}, ['css:main']);
gulp.watch(cfg.paths.globjs, {interval: 1000}, ['js:app', 'js:admin']);
gulp.watch(cfg.paths.less.main.watch, {interval: 1000}, ['css:main']);
});
// ALIASES

2
package.json
View file

@ -2,7 +2,7 @@
"name": "RainLoop",
"title": "RainLoop Webmail",
"version": "1.8.4",
"release": "312",
"release": "314",
"description": "Simple, modern & fast web-based email client",
"homepage": "http://rainloop.net",
"main": "gulpfile.js",

2
rainloop/v/0.0.0/langs/bg.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Списък с акаунти"

2
rainloop/v/0.0.0/langs/cs.ini
View file

@ -556,7 +556,7 @@ TO_MANY_FOLDERS_DESC_1 = "Máte moc složek!"
TO_MANY_FOLDERS_DESC_2 = "Můžeme zobrazit jen část z nich, abychom zabránili problémům s výkonem."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Seznam účtů"

2
rainloop/v/0.0.0/langs/de.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "Sie haben zu viele Ordner!"
TO_MANY_FOLDERS_DESC_2 = "Aus Leistungsgründen zeigen wir nur einen Teil davon an."
HELP_DELETE_FOLDER = "Ordner löschen"
HELP_SHOW_HIDE_FOLDER = "Ordner ein-/ausblenden"
HELP_SHOW_HIDE_FOLDER_COUNT = "Ordner-Nachrichtenzähler ein-/ausblenden"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Konten"

2
rainloop/v/0.0.0/langs/en-gb.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Accounts"

2
rainloop/v/0.0.0/langs/en.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Accounts"

2
rainloop/v/0.0.0/langs/es.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Lista de cuentas"

2
rainloop/v/0.0.0/langs/fr.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "Vous avez trop de dossiers !"
TO_MANY_FOLDERS_DESC_2 = "Seulement une partie d'entre eux ont été affichés afin de limiter les problèmes de performance."
HELP_DELETE_FOLDER = "Supprimer le dossier"
HELP_SHOW_HIDE_FOLDER = "Afficher/masquer le dossier"
HELP_SHOW_HIDE_FOLDER_COUNT = "Afficher/masquer le nombre de messages dans le dossier"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Liste des comptes"

2
rainloop/v/0.0.0/langs/hu.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Fiók lista"

2
rainloop/v/0.0.0/langs/is.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Aðgangslisti"

2
rainloop/v/0.0.0/langs/it.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "Ci sono troppe cartelle!"
TO_MANY_FOLDERS_DESC_2 = "Vengono visualizzate solo una parte per evitare problemi di performance."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Lista degli account"

2
rainloop/v/0.0.0/langs/ja-jp.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Account List"

2
rainloop/v/0.0.0/langs/ko-kr.ini
View file

@ -554,7 +554,7 @@ TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "계정 목록"

2
rainloop/v/0.0.0/langs/lt.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "Pas jus per daug katalogų!"
TO_MANY_FOLDERS_DESC_2 = "Mes rodome ne visus juos, kad išvengti našumo problemų."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Paskyrų sąrašas"

2
rainloop/v/0.0.0/langs/lv.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Kontu saraksts"

2
rainloop/v/0.0.0/langs/nl.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "U heeft te veel mappen!"
TO_MANY_FOLDERS_DESC_2 = "Er worden er maar een deel weergegeven om prestatieproblemen te voorkomen."
HELP_DELETE_FOLDER = "Verwijder map"
HELP_SHOW_HIDE_FOLDER = "Toon/verberg map"
HELP_SHOW_HIDE_FOLDER_COUNT = "Toon/verberg ongelezen teller"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Account Lijst"

2
rainloop/v/0.0.0/langs/no.ini
View file

@ -556,7 +556,7 @@ TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Kontoer"

2
rainloop/v/0.0.0/langs/pl.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "Masz za dużo folderów!"
TO_MANY_FOLDERS_DESC_2 = "Pokazaliśmy tylko część z nich aby uniknąć problemów z wydajnością."
HELP_DELETE_FOLDER = "Usuń folder"
HELP_SHOW_HIDE_FOLDER = "Pokaż/ukryj folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Pokaż/ukryj liczbę wiadomoci w folderze"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Lista kont"

2
rainloop/v/0.0.0/langs/pt-br.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "Você possui muitas pastas!"
TO_MANY_FOLDERS_DESC_2 = "Mostraremos apenas uma parte delas, para evitar problemas de desempenho."
HELP_DELETE_FOLDER = "Deletar pasta"
HELP_SHOW_HIDE_FOLDER = "Mostrar/esconder pasta"
HELP_SHOW_HIDE_FOLDER_COUNT = "Mostrar/esconder contagem de mensagens na pasta"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Lista de contas"

2
rainloop/v/0.0.0/langs/pt-pt.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "Você tem demasiadas pastas!"
TO_MANY_FOLDERS_DESC_2 = "Apenas apresentámos parte delas, para evitar problemas de desempenho."
HELP_DELETE_FOLDER = "Eliminar pasta"
HELP_SHOW_HIDE_FOLDER = "Mostrar/ocultar pasta"
HELP_SHOW_HIDE_FOLDER_COUNT = "Mostrar/ocultar contador de mensagens por pasta"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Lista de contas"

2
rainloop/v/0.0.0/langs/ro.ini
View file

@ -556,7 +556,7 @@ TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Lista de Conturi"

2
rainloop/v/0.0.0/langs/ru.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "У вас слишком много папок!"
TO_MANY_FOLDERS_DESC_2 = "Мы показали только часть из них, чтобы избежать проблем с производительностью."
HELP_DELETE_FOLDER = "Удалить папку"
HELP_SHOW_HIDE_FOLDER = "Показывать/прятать папку"
HELP_SHOW_HIDE_FOLDER_COUNT = "Показывать/прятать количество новых сообщений"
HELP_CHECK_FOR_NEW_MESSAGES = "Проверять/не проверять новые сообщения"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Список Аккаунтов"

2
rainloop/v/0.0.0/langs/sk.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Zoznam účtov"

2
rainloop/v/0.0.0/langs/sv.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Kontolista"

2
rainloop/v/0.0.0/langs/tr.ini
View file

@ -555,7 +555,7 @@ TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Hesap Listesi"

2
rainloop/v/0.0.0/langs/ua.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "Список акаунтів"

2
rainloop/v/0.0.0/langs/zh-cn.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "账户列表"

2
rainloop/v/0.0.0/langs/zh-tw.ini
View file

@ -557,7 +557,7 @@ TO_MANY_FOLDERS_DESC_1 = "You have too many folders!"
TO_MANY_FOLDERS_DESC_2 = "We have shown only a part of them, to avoid performance problems."
HELP_DELETE_FOLDER = "Delete folder"
HELP_SHOW_HIDE_FOLDER = "Show/hide folder"
HELP_SHOW_HIDE_FOLDER_COUNT = "Show/hide unread messages counter"
HELP_CHECK_FOR_NEW_MESSAGES = "Check/don't check for new messages"
[SETTINGS_ACCOUNTS]
LEGEND_ACCOUNTS = "帳戶列表"