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
+5 -3
View File
@@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
export interface ZBarOptions {
/**
@@ -53,7 +53,7 @@ export interface ZBarOptions {
* let options: ZBarOptions = {
* flash: 'off',
* drawSight: false
* };
* }
*
* this.zbar.scan(options)
* .then(result => {
@@ -84,6 +84,8 @@ export class ZBar extends IonicNativePlugin {
* @returns {Promise<any>} Returns a Promise that resolves with the scanned string, or rejects with an error.
*/
@Cordova()
scan(options: ZBarOptions): Promise<any> { return; }
scan(options: ZBarOptions): Promise<any> {
return;
}
}