extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add closing timer on notifications

Browse Source
This commit is contained in:
Hadi Nategh 2018-02-19 17:17:24 +01:00
parent 8f752fcc03
commit 7510a94e11
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
api/js/jsapi/egw_notification.js
View File

@ -28,6 +28,8 @@ egw.extend('notification', egw.MODULE_WND_LOCAL, function(_app, _wnd)
// Notification permission, the default value is 'default' which is equivalent to 'denied' // Notification permission, the default value is 'default' which is equivalent to 'denied'
var permission = 'default'; var permission = 'default';
// Keeps alive notifications
var alive_notifications = [];
if (typeof Notification != 'undefined') if (typeof Notification != 'undefined')
{ {
@ -80,6 +82,10 @@ egw.extend('notification', egw.MODULE_WND_LOCAL, function(_app, _wnd)
// Create an instance of Notification object // Create an instance of Notification object
var notification = new Notification(_title, inst_options); var notification = new Notification(_title, inst_options);
//set timer to close shown notification in 10 s, some browsers do not
//close it automatically.
setTimeout(notification.close.bind(notification), 10000);
// Callback function dispatches on click on notification message // Callback function dispatches on click on notification message
notification.onclick = options.onclick || ''; notification.onclick = options.onclick || '';
// Callback function dispatches when notification is shown // Callback function dispatches when notification is shown
@ -89,6 +95,9 @@ egw.extend('notification', egw.MODULE_WND_LOCAL, function(_app, _wnd)
// Callback function dispatches on error // Callback function dispatches on error
notification.onerror = options.onerror || function (e) {egw.debug('Notification failed because of ' + e);}; notification.onerror = options.onerror || function (e) {egw.debug('Notification failed because of ' + e);};
// Collect all running notifications in case if want to close them all,
// for instance on logout action.
alive_notifications.push(notification);
}, },
/** /**
@ -104,7 +113,22 @@ egw.extend('notification', egw.MODULE_WND_LOCAL, function(_app, _wnd)
}); });
} }
return (Notification && Notification.requestPermission && permission == 'granted'); return (Notification && Notification.requestPermission && permission == 'granted');
} },
/**
* Check if there's any runnig notifications and will close them all
*
*/
killAliveNotifications: function ()
{
if (alive_notifications && alive_notifications.length > 0)
{
for (var i=0; i<alive_notifications.length;i++)
{
if (typeof alive_notifications[i].close == 'function') alive_notifications[i].close();
}
alive_notifications = [];
}
}
}; };
}); });

5
notifications/js/notificationajaxpopup.js
View File

@ -576,6 +576,11 @@
return; return;
} }
if (typeof window.app == 'undefined') window.app = {}; if (typeof window.app == 'undefined') window.app = {};
window.onbeforeunload = function()
{
if (typeof egw.killAliveNotifications =='function') egw.killAliveNotifications();
};
window.app.notifications = new self(); window.app.notifications = new self();
// toggle notifications bar // toggle notifications bar
jQuery('.egwpopup_toggle').click(function(){window.app.notifications.toggle();}); jQuery('.egwpopup_toggle').click(function(){window.app.notifications.toggle();});