Merge branch 'master' into v5

This commit is contained in:
Daniel
2018-09-17 18:23:18 +02:00
parent 46b1a7385c
commit 039c6d40af
76 changed files with 846 additions and 494 deletions
+7 -24
View File
@@ -1,10 +1,5 @@
import { Injectable } from '@angular/core';
import {
Cordova,
CordovaFunctionOverride,
IonicNativePlugin,
Plugin
} from '@ionic-native/core';
import { Cordova, CordovaFunctionOverride, IonicNativePlugin, Plugin } from '@ionic-native/core';
import { Observable } from 'rxjs';
declare const window: any;
@@ -100,9 +95,7 @@ export class Geofence extends IonicNativePlugin {
* @return {Observable<any>}
*/
@CordovaFunctionOverride()
onTransitionReceived(): Observable<any> {
return;
}
onTransitionReceived(): Observable<any> { return; }
/**
* Initializes the plugin. User will be prompted to allow the app to use location and notifications.
@@ -110,9 +103,7 @@ export class Geofence extends IonicNativePlugin {
* @returns {Promise<void>}
*/
@Cordova()
initialize(): Promise<void> {
return;
}
initialize(): Promise<void> { return; }
/**
* Adds a new geofence or array of geofences. For geofence object, see above.
@@ -120,9 +111,7 @@ export class Geofence extends IonicNativePlugin {
* @returns {Promise<void>}
*/
@Cordova()
addOrUpdate(geofences: Object | Object[]): Promise<void> {
return;
}
addOrUpdate(geofences: Object | Object[]): Promise<void> { return; }
/**
* Removes a geofence or array of geofences. `geofenceID` corresponds to one or more IDs specified when the
@@ -131,9 +120,7 @@ export class Geofence extends IonicNativePlugin {
* @returns {Promise<void>}
*/
@Cordova()
remove(geofenceId: string | string[]): Promise<void> {
return;
}
remove(geofenceId: string | string[]): Promise<void> { return; }
/**
* Removes all geofences.
@@ -141,9 +128,7 @@ export class Geofence extends IonicNativePlugin {
* @returns {Promise<void>}
*/
@Cordova()
removeAll(): Promise<void> {
return;
}
removeAll(): Promise<void> { return; }
/**
* Returns an array of geofences currently being monitored.
@@ -151,9 +136,7 @@ export class Geofence extends IonicNativePlugin {
* @returns {Promise<string[]>}
*/
@Cordova()
getWatched(): Promise<string> {
return;
}
getWatched(): Promise<string> { return; }
/**
* Called when the user clicks a geofence notification. iOS and Android only.