extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-04 21:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP of Notifications system:

Browse Source 
- Add click handler on message box
- Do not send update status request if the message is already seen
This commit is contained in:
Hadi Nategh 2017-05-22 12:18:53 +02:00
parent 264d32d233
commit c945b55cce
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
notifications/js/notificationajaxpopup.js
View File

@ -108,7 +108,7 @@
).addClass('et2_link'); ).addClass('et2_link');
$egwpopup_list.append($message); $egwpopup_list.append($message);
// bind click handler after the message container is attached // bind click handler after the message container is attached
$message.click(jQuery.proxy(this.message_seen, this,[$message])); $message.click(jQuery.proxy(this.clickOnMessage, this,[$message]));
this.update_message_status(show, notifymessages[show]['status']); this.update_message_status(show, notifymessages[show]['status']);
} }
this.counterUpdate(); this.counterUpdate();
@ -128,6 +128,25 @@
} }
}; };
notifications.prototype.clickOnMessage = function (_node, _event){
_event.stopPropagation();
this.message_seen(_node, _event);
if (_event.target.classList.contains('link')) return;
var egwpopup_message = _node[0];
var id = egwpopup_message[0].id.replace(/egwpopup_message_/ig,'');
if (notifymessages[id]['data'])
{
if (notifymessages[id]['data']['id'])
{
egw.open(notifymessages[id]['data']['id'], notifymessages[id]['data']['app']);
}
else
{
egw.open_link(notifymessages[id]['data']['url'],'_blank',notifymessages[id]['data']['popup']);
}
}
};
/** /**
* Display or hide notifcation-bell * Display or hide notifcation-bell
* *
@ -150,9 +169,12 @@
_event.stopPropagation(); _event.stopPropagation();
var egwpopup_message = _node[0]; var egwpopup_message = _node[0];
var id = egwpopup_message[0].id.replace(/egwpopup_message_/ig,''); var id = egwpopup_message[0].id.replace(/egwpopup_message_/ig,'');
var request = egw.json("notifications.notifications_ajax.update_status", [id, "SEEN"]); if (notifymessages[id]['status'] !='SEEN')
request.sendRequest(true); {
this.update_message_status(id, "SEEN"); var request = egw.json("notifications.notifications_ajax.update_status", [id, "SEEN"]);
request.sendRequest(true);
this.update_message_status(id, "SEEN");
}
}; };
notifications.prototype.mark_all_seen = function() notifications.prototype.mark_all_seen = function()