Skip to content
This repository has been archived by the owner on Aug 11, 2020. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history 
Conflicts (resolved):
	plugin.xml
	src/android/README.md
  • Loading branch information
@Eccenux
Eccenux committed Jul 30, 2013
2 parents 8fa142c + 1242c55 commit 8966e52
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Follows the [Cordova Plugin spec](https://github.com/apache/cordova-plugman/blob
This plugin leverages Cordova/PhoneGap's [require/define functionality used for plugins](http://simonmacdonald.blogspot.ca/2012/08/so-you-wanna-write-phonegap-200-android.html).

Note: the Android source for this project includes an Android Library Project.
pluginstall currently doesn't support Library Project refs, so its been
plugman currently doesn't support Library Project refs, so its been
prebuilt as a jar library. Any updates to the Library Project should be
committed with an updated jar.

Expand Down Expand Up @@ -42,7 +42,8 @@ The following barcode types are currently supported:
* EAN_8
* EAN_13
* CODE_128
* CODE_3
* CODE_39
* ITF

`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.

Expand Down

0 comments on commit 8966e52

Please sign in to comment.