From aa2d2537cc74b68cc9d78d7500e5300f0f50580c Mon Sep 17 00:00:00 2001 From: piratefinn Date: Tue, 5 Jun 2018 12:25:18 +0100 Subject: [PATCH] cleaned up code keep eye on ngx-bootstrap for when it removes rxjs-compat requirement --- package.json | 2 +- src/app/providers/api-service.ts | 1 - src/app/providers/cust-pies.service.ts | 2 +- src/app/providers/cust-snippets.service.ts | 2 +- src/app/providers/org-snippets.service.ts | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 0670df4..f9be742 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "ngx-bootstrap": "^2.0.5", "ngx-pagination": "^3.1.1", "rxjs": "6.2.0", - "rxjs-compat": "^6.0.0-rc.0", + "rxjs-compat": "^6.2.0", "ts-helpers": "1.1.2", "webpack-dev-server": "^3.1.4", "zone.js": "0.8.26" diff --git a/src/app/providers/api-service.ts b/src/app/providers/api-service.ts index 819f63f..61508c1 100644 --- a/src/app/providers/api-service.ts +++ b/src/app/providers/api-service.ts @@ -1,7 +1,6 @@ import { map } from 'rxjs/operators'; import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { Observable } from 'rxjs/Rx'; import { environment } from '../../environments/environment'; diff --git a/src/app/providers/cust-pies.service.ts b/src/app/providers/cust-pies.service.ts index 4608369..b8ebafc 100644 --- a/src/app/providers/cust-pies.service.ts +++ b/src/app/providers/cust-pies.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { ApiService } from './api-service'; -import { Observable } from 'rxjs/Rx'; +import { Observable } from 'rxjs'; @Injectable() export class CustPiesService { diff --git a/src/app/providers/cust-snippets.service.ts b/src/app/providers/cust-snippets.service.ts index 9c75c5e..aef3786 100644 --- a/src/app/providers/cust-snippets.service.ts +++ b/src/app/providers/cust-snippets.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { ApiService } from './api-service'; -import { Observable } from 'rxjs/Rx'; +import { Observable } from 'rxjs'; @Injectable() export class CustSnippetsService { diff --git a/src/app/providers/org-snippets.service.ts b/src/app/providers/org-snippets.service.ts index a3849ef..ce5e262 100644 --- a/src/app/providers/org-snippets.service.ts +++ b/src/app/providers/org-snippets.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@angular/core'; import { ApiService } from './api-service'; -import { Observable } from 'rxjs/Rx'; +import { Observable } from 'rxjs'; @Injectable() export class OrgSnippetsService {