mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-05-29 23:25:27 +00:00
feat(mail): delay or disable automatic mark message as read
Fixes #1585
This commit is contained in:
@@ -53,6 +53,13 @@
|
||||
if (data.SOGoRememberLastModule)
|
||||
data.SOGoLoginModule = "Last";
|
||||
|
||||
data.SOGoMailAutoMarkAsReadDelay = parseInt(data.SOGoMailAutoMarkAsReadDelay) || 0;
|
||||
data.SOGoMailAutoMarkAsReadEnabled = (data.SOGoMailAutoMarkAsReadDelay >= 0);
|
||||
if (data.SOGoMailAutoMarkAsReadDelay > 0)
|
||||
data.SOGoMailAutoMarkAsReadMode = 'delay';
|
||||
else
|
||||
data.SOGoMailAutoMarkAsReadMode = 'immediate';
|
||||
|
||||
// Mail editor autosave is a number of minutes or 0 if disabled
|
||||
data.SOGoMailAutoSave = parseInt(data.SOGoMailAutoSave) || 0;
|
||||
|
||||
@@ -724,6 +731,15 @@
|
||||
// Don't push locale definition
|
||||
delete preferences.defaults.locale;
|
||||
|
||||
if (preferences.defaults.SOGoMailAutoMarkAsReadEnabled) {
|
||||
if (preferences.defaults.SOGoMailAutoMarkAsReadMode == 'immediate')
|
||||
preferences.defaults.SOGoMailAutoMarkAsReadDelay = 0;
|
||||
} else {
|
||||
preferences.defaults.SOGoMailAutoMarkAsReadDelay = -1;
|
||||
}
|
||||
delete preferences.defaults.SOGoMailAutoMarkAsReadEnabled;
|
||||
delete preferences.defaults.SOGoMailAutoMarkAsReadMode;
|
||||
|
||||
// Merge back mail labels keys and values
|
||||
preferences.defaults.SOGoMailLabelsColors = {};
|
||||
_.forEach(preferences.defaults.SOGoMailLabelsColorsKeys, function(key, i) {
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
$mdConstant.KEY_CODE.COMMA,
|
||||
$mdConstant.KEY_CODE.SEMICOLON
|
||||
];
|
||||
this.mailAutoMarkAsReadDelay = Preferences.defaults.SOGoMailAutoMarkAsReadEnabled ? Preferences.defaults.SOGoMailAutoMarkAsReadDelay : 5;
|
||||
|
||||
// Set alternate avatar in User service
|
||||
if (Preferences.defaults.SOGoAlternateAvatar)
|
||||
@@ -107,6 +108,10 @@
|
||||
form.$setDirty();
|
||||
};
|
||||
|
||||
this.onMailAutoMarkAsReadDelay = function() {
|
||||
this.preferences.defaults.SOGoMailAutoMarkAsReadDelay = this.mailAutoMarkAsReadDelay;
|
||||
};
|
||||
|
||||
this.addMailAccount = function(ev, form) {
|
||||
var account, index;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user