Merge remote-tracking branch 'origin/master' into v5

This commit is contained in:
Daniel
2018-03-19 08:44:12 +01:00
15 changed files with 632 additions and 111 deletions
@@ -131,12 +131,12 @@ export interface CameraPreviewPictureOptions {
pluginName: 'CameraPreview',
plugin: 'cordova-plugin-camera-preview',
pluginRef: 'CameraPreview',
repo: 'https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview',
repo:
'https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview',
platforms: ['Android', 'iOS']
})
@Injectable()
export class CameraPreview extends IonicNativePlugin {
FOCUS_MODE = {
FIXED: 'fixed',
AUTO: 'auto',
@@ -445,4 +445,12 @@ export class CameraPreview extends IonicNativePlugin {
return;
}
/**
* Add a listener for the back event for the preview
* @return {Promise<any>} if backbutton pressed
*/
@Cordova()
onBackButton(): Promise<any> {
return;
}
}