fix(plugins): fix rxjs 6 build errors

#2439
This commit is contained in:
Daniel
2018-04-05 21:44:19 +02:00
parent 48b0f16ed9
commit 3ced31ed2a
54 changed files with 580 additions and 393 deletions
+11 -11
View File
@@ -1,8 +1,12 @@
import { Injectable } from '@angular/core';
import { Cordova, CordovaCheck, CordovaProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
import { Observable } from 'rxjs/Observable';
import 'rxjs/add/observable/merge';
import {
Cordova,
CordovaCheck,
CordovaProperty,
IonicNativePlugin,
Plugin
} from '@ionic-native/core';
import { merge, Observable } from 'rxjs';
declare const navigator: any;
@@ -57,20 +61,17 @@ declare const navigator: any;
})
@Injectable()
export class Network extends IonicNativePlugin {
/**
* Connection type
* @return {string}
*/
@CordovaProperty()
type: string;
@CordovaProperty() type: string;
/**
* Downlink Max Speed
* @return {string}
*/
@CordovaProperty()
downlinkMax: string;
@CordovaProperty() downlinkMax: string;
/**
* Returns an observable to watch connection changes
@@ -78,7 +79,7 @@ export class Network extends IonicNativePlugin {
*/
@CordovaCheck()
onchange(): Observable<any> {
return Observable.merge(this.onConnect(), this.onDisconnect());
return merge(this.onConnect(), this.onDisconnect());
}
/**
@@ -104,5 +105,4 @@ export class Network extends IonicNativePlugin {
onConnect(): Observable<any> {
return;
}
}