v0.0.6 Update RXJS

rubenCodeforges · Sep 26, 2018 · d79bec3 · d79bec3
1 parent ee91ab1
commit d79bec3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-gapi",
-  "version": "0.0.51",
+  "version": "0.0.6",
   "description": "Angular 4+ Google api module ng-gapi",
   "main": "./lib/index.js",
   "typings": "./lib/index.d.ts",
@@ -49,7 +49,7 @@
     "@angular/core": "^4.4.6",
     "@angular/platform-server": "^4.4.6",
     "@types/node": "7.0.10",
-    "rxjs": "^5.5.5",
+    "rxjs": "^6.3.3",
     "typescript": "^2.6.2",
     "zone.js": "^0.8.18"
   }

diff --git a/src/GoogleAuthService.ts b/src/GoogleAuthService.ts
@@ -1,10 +1,10 @@
 import {Injectable} from "@angular/core";
-import {Observable} from "rxjs/Observable";
-import {Observer} from "rxjs/Observer";
-import { of } from 'rxjs';
-import{ mergeMap } from 'rxjs/operators';
 import {GoogleApiService} from "./GoogleApiService";
 import GoogleAuth = gapi.auth2.GoogleAuth;
+import {mergeMap} from 'rxjs/operators';
+import {of} from 'rxjs/internal/observable/of';
+import {Observable} from 'rxjs/Observable';
+import {Observer} from 'rxjs/Observer';
 
 @Injectable()
 export class GoogleAuthService {
@@ -18,7 +18,8 @@ export class GoogleAuthService {
 
     public getAuth(): Observable<GoogleAuth> {
         if (!this.GoogleAuth) {
-            return this.googleApi.onLoad().pipe(mergeMap(() => { return _this.loadGapiAuth(); }));
+            return this.googleApi.onLoad()
+                .pipe(mergeMap(() => this.loadGapiAuth()));
         }
         return of(this.GoogleAuth);
     }