1 files changed, 37 insertions, 38 deletions

diff --git a/src/webview/notifications.ts b/src/webview/notifications.ts
index e4401ab6e..0da86fbba 100644
--- a/src/webview/notifications.ts
+++ b/src/webview/notifications.ts
@@ -31,52 +31,51 @@ export class NotificationsHandler {
 }
 
 export const notificationsClassDefinition = `(() => {
-  class Notification {
-    static permission = 'granted';
-
-    constructor(title = '', options = {}) {
-      this.title = title;
-      this.options = options;
-      try {
-        window.ferdium.displayNotification(title, options)
-          .then(() => {
-            if (typeof (this.onClick) === 'function') {
-              this.onClick();
-            }
-          });
-      } catch(error) {
-                this.options.onClick = null;
-          window.ferdium.displayNotification(title, options)
-            .then(() => {
-              if (typeof (this.onClick) === 'function') {
-                this.onClick();
-              }
-            });
-      }
-    }
+class Notification {
+  static permission = 'granted';
 
-    static requestPermission(cb = null) {
-      if (!cb) {
-        return new Promise((resolve) => {
-          resolve(Notification.permission);
-        });
-      }
+  static _notification;
 
-      if (typeof (cb) === 'function') {
-        return cb(Notification.permission);
-      }
+  constructor(title = '', options = {}) {
+    Notification._displayNotification(title, options);
+  }
 
-      return Notification.permission;
-    }
+  static _displayNotification(title, options) {
+    Notification._notification = window.ferdium
+      .displayNotification(title, options)
+      .then(() => {
+        // TODO: After several tries, we couldn't find a way to trigger the native notification onclick event.
+        // This was needed so that user could go to the specific context when clicking on the notification (it only goes to the service now).
+        // For now, we don't do anything here
+      });
+  }
 
-    onNotify(data) {
-      return data;
+  static requestPermission(cb) {
+    if (typeof cb === 'function') {
+      cb(Notification.permission);
     }
 
-    onClick() {}
+    return Promise.resolve(Notification.permission);
+  }
+
+  onNotify(data) {
+    return data;
+  }
 
-    close() {}
+  close() {
+    if (Notification._notification) {
+      Notification._notification = null;
+    }
   }
 
+  onclick() {}
+
+  onclose() {}
+
+  onerror() {}
+
+  onshow() {}
+}
+
   window.Notification = Notification;
 })();`;