friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

remove close timeout

This commit is contained in:
Fabrixxm 2015-06-24 11:15:35 +02:00
parent d8f69737ab
commit bd3f29f266
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/main.js
View File

@ -184,24 +184,26 @@
var notification_lastitem = localStorage.getItem("notification-lastitem"); var notification_lastitem = localStorage.getItem("notification-lastitem");
var notification_first_id = 0; var notification_first_id = 0;
var notification_id;
eNotif.children("note").each(function(){ eNotif.children("note").each(function(){
e = $(this); e = $(this);
text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>"); text = e.text().format("<span class='contactname'>"+e.attr('name')+"</span>");
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);
var notification_id = e.attr('href').match(/\d+$/)[0]; notification_id = e.attr('href').match(/\d+$/)[0];
if (notification_lastitem!== null && notification_id!=notification_lastitem) { if (notification_lastitem!== null && notification_id!=notification_lastitem) {
if (notification_first_id===0) notification_first_id = notification_id; if (notification_first_id===0) notification_first_id = notification_id;
if (getNotificationPermission()==="granted") { if (getNotificationPermission()==="granted") {
console.log("notification", e.text().replace('&rarr; ','').format(e.attr('name')));
var notification = new Notification(document.title, { var notification = new Notification(document.title, {
body: e.text().replace('&rarr; ','').format(e.attr('name')), body: e.text().replace('&rarr; ','').format(e.attr('name')),
icon: e.attr('photo'), icon: e.attr('photo'),
data: e.attr('href')
}); });
// close notification after 5 secs. // close notification after 5 secs.
// see https://developer.mozilla.org/en-US/docs/Web/API/Notifications_API/Using_the_Notifications_API#Closing_notifications // see https://developer.mozilla.org/en-US/docs/Web/API/Notifications_API/Using_the_Notifications_API#Closing_notifications
setTimeout(notification.close.bind(notification), 5000); //setTimeout(notification.close.bind(notification), 5000);
notification.addEventListener("click", function(ev){ notification.addEventListener("click", function(ev){
window.location = ev.target.data; window.location = ev.target.data;
@ -788,7 +790,9 @@ function getNotificationPermission() {
return null; return null;
} }
if (Notification.permission === 'granted') { if (Notification.permission === 'granted') {
return localStorage.getItem('notification-permissions'); var val = localStorage.getItem('notification-permissions');
if (val === null) return 'denied';
return val;
} else { } else {
return Notification.permission; return Notification.permission;
} }