Merge remote-tracking branch 'origin/master'

flauc · Nov 1, 2016 · c6a5fea · c6a5fea
2 parents b1ef230 + f65f336
commit c6a5fea
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/src/notification.component.ts b/src/notification.component.ts
@@ -236,7 +236,7 @@ export class NotificationComponent implements OnInit, OnDestroy {
         return this.position !== 0 ? this.position * 90 : 0;
     }
 
-    onClick($e): void {
+    onClick($e: any): void {
         this.item.click.emit($e);
 
         if (this.clickToClose) {

diff --git a/src/push-notifications.service.ts b/src/push-notifications.service.ts
@@ -7,11 +7,15 @@ declare const Notification: any;
 @Injectable()
 export class PushNotificationsService {
 
-    permission: Permission = 'granted';
+    permission: Permission;
+
+    constructor() {
+        this.permission  = this.isSupported() ? Notification.permission : 'denied';
+    }
 
     requestPermission() {
         if ('Notification' in window)
-            Notification.requestPermission(status => this.permission = status);
+            Notification.requestPermission((status: any) => this.permission = status);
     }
 
     isSupported() {
@@ -20,31 +24,25 @@ export class PushNotificationsService {
 
     create(title: string, options?: PushNotification): any {
 
-        return new Observable(obs => {
+        return new Observable((obs: any) => {
 
             if (!('Notification' in window)) {
-                obs.error('Notifications are not available in this envirement');
+                obs.error('Notifications are not available in this environment');
                 obs.complete();
             }
 
-            this.permission = Notification.permission;
-
             if (this.permission !== 'granted') {
-                obs.error(`The user didn't granted you permission to send push notifications`);
+                obs.error(`The user hasn't granted you permission to send push notifications`);
                 obs.complete();
             }
 
             const n = new Notification(title, options);
 
-            n.onshow = (e) => obs.next({notification: n, event: e});
-            n.onclick = (e) => obs.next({notification: n, event: e});
-            n.onerror = (e) => obs.error({notification: n, event: e});
+            n.onshow = (e: any) => obs.next({notification: n, event: e});
+            n.onclick = (e: any) => obs.next({notification: n, event: e});
+            n.onerror = (e: any) => obs.error({notification: n, event: e});
             n.onclose = () => obs.complete();
-            n.close = () => {
-                n.close.bind(n);
-                obs.complete();
-            };
         });
     }
 
-}
+}