extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

do NOT update counter in Mail tab-header, eg. for Junk

Browse Source
This commit is contained in:
Ralf Becker 2020-08-06 13:00:35 +02:00
parent e3c356b2c2
commit 879943f3d2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/js/app.js
View File

@ -427,6 +427,8 @@ app.classes.mail = AppJS.extend(
// notify user a new mail arrived
if (pushData.type === 'add')
{
// never notify for Trash, Junk, Drafts or Sent folder
if (pushData.acl.folder.match(/^(INBOX.)?(Trash|Spam|Junk|Drafts|Sent)$/)) return;
// increment notification counter on (closed) mail tab
let framework = egw_getFramework();
if (framework) framework.notifyAppTab('mail');
@ -472,8 +474,6 @@ app.classes.mail = AppJS.extend(
{
let framework = egw_getFramework();
let notify = this.egw.preference('new_mail_notification', 'mail');
// never notify for Trash, Junk or Drafts folder
if (pushData.acl.folder.match(/^(INBOX.)?(Trash|Spam|Junk|Drafts|Sent)$/)) return;
if (typeof notify === 'undefined' || notify === 'always' ||
notify === 'not-mail' && framework && framework.activeApp.appName !== 'mail')
{