ctdo
/
raumstatus
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved the if(enabled) to notification api

This commit is contained in:
Tim Windelschmidt 2016-01-06 08:28:39 +01:00
parent 4586e7e12a
commit e4fae9ca53
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node/public/js/app.js
View File

@ -86,10 +86,10 @@ gpower = new JustGage({
}); });
function stateNotification(state) { function stateNotification(state) {
if (state == true && laststate != true && laststate != null && enabledNotifications) { if (state == true && laststate != true && laststate != null) {
laststate = true; laststate = true;
showNotification("CTDO - Status", "Der Chaostreff ist nun offen.", "/img/green.png", 4); showNotification("CTDO - Status", "Der Chaostreff ist nun offen.", "/img/green.png", 4);
} else if (state == false && laststate != false && laststate != null && enabledNotifications) { } else if (state == false && laststate != false && laststate != null) {
laststate = false; laststate = false;
showNotification("CTDO - Staus", "Der Chaostreff ist nun geschlossen", "/img/red.png", 4); showNotification("CTDO - Staus", "Der Chaostreff ist nun geschlossen", "/img/red.png", 4);
} else { } else {

42
node/public/js/vendor/notification.js vendored
View File

@ -26,25 +26,27 @@ function toggleNotifications() {
function showNotification(name, body, icon, timeout) { function showNotification(name, body, icon, timeout) {
var instance = new Notification( if (enabledNotifications) {
name, { var instance = new Notification(
body: body, name, {
icon: icon body: body,
} icon: icon
); }
);
instance.onclick = function () { instance.onclick = function () {
// Something to do // Something to do
}; };
instance.onerror = function () { instance.onerror = function () {
// Something to do // Something to do
}; };
instance.onshow = function () { instance.onshow = function () {
setTimeout(function(){ setTimeout(function(){
instance.close(); instance.close();
}, timeout * 1000); }, timeout * 1000);
}; };
instance.onclose = function () { instance.onclose = function () {
// Something to do // Something to do
}; };
}
} }