extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 09:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix notifications popup gets closed automatically when click is triggered from unread indicator element

Browse Source
This commit is contained in:
Hadi Nategh 2019-12-02 17:36:30 +01:00
parent e305ba1d23
commit 8807c9242c
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
notifications/js/notificationajaxpopup.js
View File

@ -765,7 +765,7 @@
if (!$egwpopup.is(":visible")) if (!$egwpopup.is(":visible"))
{ {
$body.on('click', function(e){ $body.on('click', function(e){
if (!$counter.is(e.target) && e.originalEvent.target.className !== 'popup_note' && if (!$counter.is(e.target) && $counter.find(e.target).length == 0 &&
!$egwpopup.is(e.target) && $egwpopup.has(e.target).length == 0) !$egwpopup.is(e.target) && $egwpopup.has(e.target).length == 0)
{ {
jQuery(this).off(e); jQuery(this).off(e);
@ -781,8 +781,6 @@
if (_stat) return; if (_stat) return;
$body.off('click'); $body.off('click');
} }
// Remove popup_note as soon as message list is toggled
jQuery('.popup_note', '#topmenu_info_notifications').remove();
if ($egwpopup.length>0) $egwpopup.toggle('slide'); if ($egwpopup.length>0) $egwpopup.toggle('slide');
}; };
@ -793,7 +791,6 @@
notifications.prototype.counterUpdate = function () notifications.prototype.counterUpdate = function ()
{ {
var $topmenu_info_notifications = jQuery('#topmenu_info_notifications'); var $topmenu_info_notifications = jQuery('#topmenu_info_notifications');
var $popup_note = jQuery(document.createElement('div')).addClass('popup_note');
var counter = 0; var counter = 0;
for (var id in notifymessages) for (var id in notifymessages)
{ {
@ -803,7 +800,6 @@
{ {
$topmenu_info_notifications.addClass('egwpopup_notify'); $topmenu_info_notifications.addClass('egwpopup_notify');
framework.topmenu_info_notify('notifications', true, counter,egw.lang('You have %1 unread notifications', counter)); framework.topmenu_info_notify('notifications', true, counter,egw.lang('You have %1 unread notifications', counter));
setTimeout(function (){$popup_note.remove();}, 4000);
} }
else else
{ {