Fix iOS issues after merge

Added a guard to native iOS code to allow for not passing in any option to `scan` (as found by @vladimir-kotikov)
phonegap · May 5, 2016 · 06f4a7d · 06f4a7d
1 parent 5641c8e
commit 06f4a7d
Show file tree

Hide file tree

Showing 6 changed files with 216 additions and 61 deletions.
diff --git a/README.md b/README.md
@@ -144,7 +144,7 @@ A full example could be:
           "showFlipCameraButton" : true, // iOS and Android
           "prompt" : "Place a barcode inside the scan area", // supported on Android only
           "formats" : "QR_CODE,PDF_417", // default: all but PDF_417 and RSS_EXPANDED
-          "orientation" : "landscape"
+          "orientation" : "landscape" // Android only (portrait|landscape), default unset so it rotates with the device
       }
    );
 ```

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "phonegap-plugin-barcodescanner",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "You can use the BarcodeScanner plugin to scan different types of barcodes (using the device's camera) and get the metadata encoded in them for processing within your application.",
   "cordova": {
     "id": "phonegap-plugin-barcodescanner",

diff --git a/plugin.xml b/plugin.xml
@@ -29,6 +29,7 @@
         </config-file>
 
         <resource-file src="src/ios/scannerOverlay.xib" />
+        <resource-file src="src/ios/CDVBarcodeScanner.bundle" />
 
         <header-file src="src/ios/zxing-all-in-one.h" />
 
@@ -40,6 +41,9 @@
         <framework src="AssetsLibrary.framework" />
         <framework src="CoreVideo.framework" />
         <framework src="QuartzCore.framework" />
+        <framework src="CoreGraphics.framework" />
+        <framework src="CoreImage.framework" />
+        <framework src="AudioToolbox.framework" />
     </platform>
 
     <!-- android -->

diff --git a/src/ios/CDVBarcodeScanner.bundle/beep.caf b/src/ios/CDVBarcodeScanner.bundle/beep.caf