Merge in v5 code

This commit is contained in:
Ibby Hadeed
2017-12-28 07:28:44 -05:00
parent d43fe72f7b
commit 0f9c21ab42
255 changed files with 11473 additions and 6501 deletions
+15 -7
View File
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
import { Observable } from 'rxjs/Observable';
@@ -35,7 +35,8 @@ export class Keyboard extends IonicNativePlugin {
* @param hide {boolean}
*/
@Cordova({ sync: true })
hideKeyboardAccessoryBar(hide: boolean): void { }
hideKeyboardAccessoryBar(hide: boolean): void {
}
/**
* Force keyboard to be shown.
@@ -44,7 +45,8 @@ export class Keyboard extends IonicNativePlugin {
sync: true,
platforms: ['Android', 'BlackBerry 10', 'Windows']
})
show(): void { }
show(): void {
}
/**
* Close the keyboard if open.
@@ -53,7 +55,8 @@ export class Keyboard extends IonicNativePlugin {
sync: true,
platforms: ['iOS', 'Android', 'BlackBerry 10', 'Windows']
})
close(): void { }
close(): void {
}
/**
* Prevents the native UIScrollView from moving when an input is focused.
@@ -63,7 +66,8 @@ export class Keyboard extends IonicNativePlugin {
sync: true,
platforms: ['iOS', 'Windows']
})
disableScroll(disable: boolean): void { }
disableScroll(disable: boolean): void {
}
/**
* Creates an observable that notifies you when the keyboard is shown. Unsubscribe to observable to cancel event watch.
@@ -74,7 +78,9 @@ export class Keyboard extends IonicNativePlugin {
event: 'native.keyboardshow',
platforms: ['iOS', 'Android', 'BlackBerry 10', 'Windows']
})
onKeyboardShow(): Observable<any> { return; }
onKeyboardShow(): Observable<any> {
return;
}
/**
* Creates an observable that notifies you when the keyboard is hidden. Unsubscribe to observable to cancel event watch.
@@ -85,6 +91,8 @@ export class Keyboard extends IonicNativePlugin {
event: 'native.keyboardhide',
platforms: ['iOS', 'Android', 'BlackBerry 10', 'Windows']
})
onKeyboardHide(): Observable<any> { return; }
onKeyboardHide(): Observable<any> {
return;
}
}