Merge branch 'master' of github.com:driftyco/ionic-native

This commit is contained in:
Ibby 2017-01-09 07:13:04 -05:00
commit 92e0bb55c3
3 changed files with 4 additions and 4 deletions

View File

@ -205,7 +205,7 @@ export class BLE {
@Cordova({ @Cordova({
observable: true, observable: true,
clearFunction: 'stopScan', clearFunction: 'stopScan',
clearWithArgs: true clearWithArgs: false
}) })
static startScan(services: string[]): Observable<any> { return; } static startScan(services: string[]): Observable<any> { return; }
@ -218,7 +218,7 @@ export class BLE {
@Cordova({ @Cordova({
observable: true, observable: true,
clearFunction: 'stopScan', clearFunction: 'stopScan',
clearWithArgs: true clearWithArgs: false
}) })
static startScanWithOptions(services: string[], options: {reportDuplicates?: boolean} | any): Observable<any> { return; } static startScanWithOptions(services: string[], options: {reportDuplicates?: boolean} | any): Observable<any> { return; }

View File

@ -26,7 +26,7 @@ export interface OSNotification {
* **ANDROID** - Notification is a summary notification for a group this will contain all notification payloads it was created from. * **ANDROID** - Notification is a summary notification for a group this will contain all notification payloads it was created from.
*/ */
groupedNotifications?: OSNotificationPayload[]; groupedNotifications?: OSNotificationPayload[];
app_id: string; app_id?: string;
contents: any; contents: any;
headings?: any; headings?: any;
isIos?: boolean; isIos?: boolean;

View File

@ -21,7 +21,7 @@ declare var sqlitePlugin;
* }) * })
* .then((db: SQLite) => { * .then((db: SQLite) => {
* *
* db.executeSql('create table danceMoves(name VARCHAR(32))').then(() => {}).catch(() => {}); * db.executeSql('create table danceMoves(name VARCHAR(32))', {}).then(() => {}).catch(() => {});
* *
* }) * })
* .catch(error => console.error('Error opening database', error); * .catch(error => console.error('Error opening database', error);