Merge pull request #217 from Telerik-Verified-Plugins/merge-phonegap-…

…official

.gitignore

@@ -2,5 +2,6 @@
 bin/
 .classpath
 .project
+.idea
 *.iml
-local.properties
+local.properties

.travis.yml

@@ -4,10 +4,10 @@ git:
 node_js:
   - "0.10"
 install:
-  - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config 
+  - echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
   - cd ..
   - npm install -g cordova-paramedic
   - npm install -g cordova
   - npm install -g ios-sim
 script:
-  - cordova-paramedic --platform ios --plugin ${TRAVIS_BUILD_DIR}
+  - cordova-paramedic --platform ios --plugin ${TRAVIS_BUILD_DIR}

README.md

@@ -60,9 +60,12 @@ The following barcode types are currently supported:
 * CODABAR
 * ITF
 * RSS14
-* PDF417
 * RSS_EXPANDED
 
+Not by default, but supported if you pass in the "formats" option:
+* PDF417
+* AZTEC
+
 ### iOS
 
 * QR_CODE
@@ -125,7 +128,7 @@ The following barcode types are currently supported:
 `success` and `fail` are callback functions. Success is passed an object with data, type and cancelled properties. Data is the text representation of the barcode data, type is the type of barcode detected and cancelled is whether or not the user cancelled the scan.
 
 A full example could be:
-```
+```js
    cordova.plugins.barcodeScanner.scan(
       function (result) {
           alert("We got a barcode\n" +
@@ -135,6 +138,13 @@ A full example could be:
       }, 
       function (error) {
           alert("Scanning failed: " + error);
+      },
+      {
+          "preferFrontCamera" : true, // iOS and Android
+          "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" // Android only (portrait|landscape), default unset so it rotates with the device
       }
    );
 ```

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",