projects
/
KiwiIRC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with upstrea/development
[KiwiIRC.git]
/
client
/
src
/
applets
/
settings.js
diff --git
a/client/src/applets/settings.js
b/client/src/applets/settings.js
index f041ab196506c6ba4efe2fcbed8ceb52707540e2..aa5896d22d319520d69f49a8c006b01e2d021acc 100644
(file)
--- a/
client/src/applets/settings.js
+++ b/
client/src/applets/settings.js
@@
-122,7
+122,13
@@
},
\r
\r
enableNoticiations: function(event){
\r
},
\r
\r
enableNoticiations: function(event){
\r
- window.webkitNotifications.requestPermission();
\r
+ event.preventDefault();
\r
+
\r
+ if ('webkitNotifications' in window) {
\r
+ window.webkitNotifications.requestPermission();
\r
+ } else if ('Notification' in window) {
\r
+ Notification.requestPermission();
\r
+ }
\r
}
\r
\r
});
\r
}
\r
\r
});
\r