diff --git a/src/plugins/admob.ts b/src/plugins/admob.ts index 8f781a88e..91a9367c1 100644 --- a/src/plugins/admob.ts +++ b/src/plugins/admob.ts @@ -1,5 +1,5 @@ import {Plugin, Cordova} from './plugin'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs/Rx'; /** * @name AdMob @@ -174,4 +174,4 @@ export class AdMob { }) static onInterstitialDismiss (): Observable {return; } -} \ No newline at end of file +} diff --git a/src/plugins/background-geolocation.ts b/src/plugins/background-geolocation.ts index 86786a7ac..3cf540008 100644 --- a/src/plugins/background-geolocation.ts +++ b/src/plugins/background-geolocation.ts @@ -1,5 +1,5 @@ import {Plugin, Cordova} from './plugin'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs/Rx'; declare var window; diff --git a/src/plugins/batterystatus.ts b/src/plugins/batterystatus.ts index c52b7aee3..efdb3972e 100644 --- a/src/plugins/batterystatus.ts +++ b/src/plugins/batterystatus.ts @@ -1,5 +1,5 @@ import {Plugin, Cordova} from './plugin'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs/Rx'; /** * @name Battery Status diff --git a/src/plugins/ble.ts b/src/plugins/ble.ts index c4bf4e7c4..f95941c35 100644 --- a/src/plugins/ble.ts +++ b/src/plugins/ble.ts @@ -1,5 +1,5 @@ import {Plugin, Cordova} from './plugin'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs/Rx'; /** * @name BLE diff --git a/src/plugins/bluetoothserial.ts b/src/plugins/bluetoothserial.ts index 4bec47e62..901ae1a57 100644 --- a/src/plugins/bluetoothserial.ts +++ b/src/plugins/bluetoothserial.ts @@ -1,5 +1,5 @@ import {Plugin, Cordova} from './plugin'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs/Rx'; /** * @name Bluetooth Serial @@ -221,4 +221,4 @@ export class BluetoothSerial { -} \ No newline at end of file +} diff --git a/src/plugins/dbmeter.ts b/src/plugins/dbmeter.ts index 9a9a9ff44..aee63c2de 100644 --- a/src/plugins/dbmeter.ts +++ b/src/plugins/dbmeter.ts @@ -1,5 +1,5 @@ import {Plugin, Cordova} from './plugin'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs/Rx'; /** * @name DB Meter * @description This plugin defines a global DBMeter object, which permits to get the decibel values from the microphone. @@ -68,4 +68,4 @@ export class DBMeter { @Cordova() static delete(): Promise {return; } -} \ No newline at end of file +} diff --git a/src/plugins/devicemotion.ts b/src/plugins/devicemotion.ts index 26eee6837..c991c628e 100644 --- a/src/plugins/devicemotion.ts +++ b/src/plugins/devicemotion.ts @@ -1,5 +1,5 @@ import {Plugin, Cordova} from './plugin'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs/Rx'; export interface AccelerationData { @@ -101,4 +101,4 @@ export class DeviceMotion { static watchAcceleration(options?: AccelerometerOptions): Observable { return; } -} \ No newline at end of file +} diff --git a/src/plugins/deviceorientation.ts b/src/plugins/deviceorientation.ts index c0a9be5c2..853c5d7c2 100644 --- a/src/plugins/deviceorientation.ts +++ b/src/plugins/deviceorientation.ts @@ -1,5 +1,5 @@ import {Plugin, Cordova} from './plugin'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs/Rx'; export interface CompassHeading { diff --git a/src/plugins/geolocation.ts b/src/plugins/geolocation.ts index fea2a97dc..781c7ed3e 100644 --- a/src/plugins/geolocation.ts +++ b/src/plugins/geolocation.ts @@ -1,5 +1,5 @@ import {Plugin, Cordova} from './plugin'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs/Rx'; declare var window; diff --git a/src/plugins/googlemaps.ts b/src/plugins/googlemaps.ts index a24462f75..fbdd3f7eb 100644 --- a/src/plugins/googlemaps.ts +++ b/src/plugins/googlemaps.ts @@ -1,5 +1,5 @@ import {Cordova, Plugin} from './plugin'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs/Rx'; import {CordovaInstance} from './plugin'; /** * Created by Ibrahim on 3/29/2016. diff --git a/src/plugins/keyboard.ts b/src/plugins/keyboard.ts index 7c01269cc..570af472b 100644 --- a/src/plugins/keyboard.ts +++ b/src/plugins/keyboard.ts @@ -1,5 +1,5 @@ import {Cordova, Plugin} from './plugin'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs/Rx'; /** * @name Keyboard diff --git a/src/plugins/network.ts b/src/plugins/network.ts index 3986963ab..9c6d07af3 100644 --- a/src/plugins/network.ts +++ b/src/plugins/network.ts @@ -1,5 +1,5 @@ import {Plugin, Cordova, CordovaProperty} from './plugin'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs/Rx'; declare var navigator: any; @@ -25,7 +25,7 @@ declare var navigator: any; * let connectSubscription = Network.onConnect().subscribe(() => { * console.log('network connected!');
* * // We just got a connection but we need to wait briefly - * 
// before we determine the connection type. Might need to wait
 + *
// before we determine the connection type. Might need to wait
 * // prior to doing any api requests as well. * setTimeout(() => { * console.log(Network.connection); diff --git a/src/plugins/plugin.ts b/src/plugins/plugin.ts index 4b3f38107..014d72a18 100644 --- a/src/plugins/plugin.ts +++ b/src/plugins/plugin.ts @@ -6,7 +6,7 @@ declare var window; declare var Promise; declare var $q; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs/Rx'; /** * @private @@ -335,4 +335,4 @@ export function InstanceProperty(target: Function, key: string, descriptor: Type }; return descriptor; -} \ No newline at end of file +} diff --git a/src/plugins/toast.ts b/src/plugins/toast.ts index 00e12aa86..ff48e1c7e 100644 --- a/src/plugins/toast.ts +++ b/src/plugins/toast.ts @@ -1,5 +1,5 @@ import {Plugin, Cordova} from './plugin'; -import {Observable} from 'rxjs/Observable'; +import {Observable} from 'rxjs/Rx'; export interface ToastOptions { /**