extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-24 06:01:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only set notification tab for none active tabs

Browse Source
This commit is contained in:
Hadi Nategh 2020-07-23 17:39:39 +02:00
parent 0f799acd75
commit 0cea328928
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/js/framework/fw_desktop.js
View File

@ -518,7 +518,11 @@
notifyAppTab: function(_appname, _clear) notifyAppTab: function(_appname, _clear)
{ {
var tab = this.tabsUi.getTab(_appname); var tab = this.tabsUi.getTab(_appname);
if (tab) this.tabsUi.getTab(_appname).setNotification(_clear); // do not set tab's notification if it's the active tab
if (tab && (this.activeApp.appName != _appname || _clear))
{
this.tabsUi.getTab(_appname).setNotification(_clear);
}
} }
}); });
})(window); })(window);

4
notifications/js/notificationajaxpopup.js
View File

@ -824,13 +824,9 @@
if (notifymessages[id]['status'] != 'SEEN') if (notifymessages[id]['status'] != 'SEEN')
{ {
counter++; counter++;
// do not set tab's notification if it's the active tab
if (framework.activeApp.appName != notifymessages[id]['extra_data']['app'])
{
framework.notifyAppTab(notifymessages[id]['extra_data']['app']); framework.notifyAppTab(notifymessages[id]['extra_data']['app']);
} }
} }
}
if (counter > 0) if (counter > 0)
{ {
$topmenu_info_notifications.addClass('egwpopup_notify'); $topmenu_info_notifications.addClass('egwpopup_notify');