tobias/friendica
1
0
Fork 0
Code Pull requests Activity

fix desktop notification logic, add onclick handler

Browse source
This commit is contained in:
Fabrixxm 2015-06-24 10:56:10 +02:00
parent cc9da2512b
commit 4549773389
1 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
js/main.js
View file

@ -183,7 +183,7 @@
//nnm.attr('popup','true'); //nnm.attr('popup','true');
var notification_lastitem = localStorage.getItem("notification-lastitem"); var notification_lastitem = localStorage.getItem("notification-lastitem");
var notification_id = 0; var notification_first_id = 0;
eNotif.children("note").each(function(){ eNotif.children("note").each(function(){
e = $(this); e = $(this);
@ -191,22 +191,34 @@
html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen')); html = notifications_tpl.format(e.attr('href'),e.attr('photo'), text, e.attr('date'), e.attr('seen'));
nnm.append(html); nnm.append(html);
notification_id = e.attr('href').match(/\d+$/)[0]; var notification_id = e.attr('href').match(/\d+$/)[0];
console.log(notification_lastitem, notification_id);
if (notification_lastitem!== null && notification_id>notification_lastitem) { if (notification_lastitem!== null && notification_id!=notification_lastitem) {
notification_lastitem = notification_id; console.log( "eh!",getNotificationPermission() );
if (notification_first_id===0) notification_first_id = notification_id;
if (getNotificationPermission()==="granted") { if (getNotificationPermission()==="granted") {
var notification = new Notification(document.title, { var notification = new Notification(document.title, {
body: e.text().replace('→ ','').format(e.attr('name')), body: e.text().replace('→ ','').format(e.attr('name')),
icon: e.attr('photo') icon: e.attr('photo'),
});
// close notification after 5 secs.
// see https://developer.mozilla.org/en-US/docs/Web/API/Notifications_API/Using_the_Notifications_API#Closing_notifications
setTimeout(notification.close.bind(notification), 5000);
notification.addEventListener("click", function(ev){
window.location = ev.target.data;
}); });
// TODO (yet unsupported by most browsers):
// Implement notification.onclick()
} }
} }
if (notification_id == notification_lastitem) {
if (notification_first_id===0) notification_first_id = notification_id;
notification_lastitem = null;
}
}); });
if (notification_lastitem===null) notification_lastitem = notification_id; if (notification_first_id!==0) notification_lastitem = notification_first_id;
console.log("end:", notification_lastitem, notification_first_id);
localStorage.setItem("notification-lastitem", notification_lastitem) localStorage.setItem("notification-lastitem", notification_lastitem)
$("img[data-src]", nnm).each(function(i, el){ $("img[data-src]", nnm).each(function(i, el){