Fix some JS fatal errors in notification.js

Fix a key error in Notification

app/widgets/Notification/Notification.php

@@ -32,15 +32,16 @@ class Notification extends WidgetBase
         RPC::call('Notification.desktop', $title, $body, $picture, $action);
 
         $notifs_key = $session->get('notifs_key');
-        if($notifs_key != null && $key == $notifs_key) return;
-
-        RPC::call('Notification.android', $title, $body, $picture, $action);
 
         if($notifs == null) $notifs = array();
 
         $explode = explode('|', $key);
         $first = reset($explode);
 
+        if($notifs_key != null && $first == $notifs_key) return;
+
+        RPC::call('Notification.android', $title, $body, $picture, $action);
+
         if(array_key_exists($first, $notifs)) {
             $notifs[$first]++;
         } else {

app/widgets/Notification/notification.js

@@ -111,7 +111,10 @@ var Notification = {
     },
     desktop : function(title, body, picture, action) {
         if(Notification.inhibed == true
-        || Notification.focused) return;
+        || Notification.focused
+        || typeof DesktopNotification === 'undefined') return;
+
+        console.log(Notification.focused);
 
         var notification = new DesktopNotification(title, { icon: picture, body: body });
 
@@ -152,6 +155,8 @@ document.onfocus = function() {
 
 
 window.addEventListener('load', function () {
+    if(typeof DesktopNotification === 'undefined') return;
+
     DesktopNotification.requestPermission(function (status) {
     // This allows to use Notification.permission with Chrome/Safari
     if(DesktopNotification.permission !== status) {