Use <js-module> in favour of <asset> for the JS

Merge branch 'js_module' of https://github.com/agrieve/BarcodeScanner

Conflicts:
	README.md
	plugin.xml
This commit is contained in:
Ryan Willoughby
2013-09-12 15:38:05 -07:00
3 changed files with 9 additions and 19 deletions
+2 -8
View File
@@ -5,8 +5,6 @@ Cross-platform BarcodeScanner for Cordova / PhoneGap.
Follows the [Cordova Plugin spec](https://github.com/apache/cordova-plugman/blob/master/plugin_spec.md), so that it works with [Plugman](https://github.com/apache/cordova-plugman).
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.
plugman currently doesn't support Library Project refs, so its been
prebuilt as a jar library. Any updates to the Library Project should be
@@ -49,9 +47,7 @@ The following barcode types are currently supported:
A full example could be:
```
var scanner = cordova.require("cordova/plugin/BarcodeScanner");
scanner.scan(
cordova.plugins.barcodeScanner.scan(
function (result) {
alert("We got a barcode\n" +
"Result: " + result.text + "\n" +
@@ -76,9 +72,7 @@ Supported encoding types:
```
A full example could be:
var scanner = cordova.require("cordova/plugin/BarcodeScanner");
scanner.encode(scanner.Encode.TEXT_TYPE, "http://www.nhl.com", function(success) {
cordova.plugins.barcodeScanner.encode(BarcodeScanner.Encode.TEXT_TYPE, "http://www.nytimes.com", function(success) {
alert("encode success: " + success);
}, function(fail) {
alert("encoding failed: " + fail);
+6 -6
View File
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?><plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="com.phonegap.plugins.barcodescanner"
version="0.7.2">
version="1.0.0">
<name>BarcodeScanner</name>
<description>Scans Barcodes.</description>
<license>MIT</license>
<engines>
<engine name="cordova" version=">=2.8.0" />
<engine name="cordova" version=">=2.9.0" />
</engines>
<asset src="www/barcodescanner.js" target="barcodescanner.js" />
<license>MIT</license>
<js-module src="www/barcodescanner.js" name="BarcodeScanner">
<clobbers target="cordova.plugins.barcodeScanner" />
</js-module>
<!-- ios -->
<platform name="ios">
+1 -5
View File
@@ -7,10 +7,6 @@
*/
cordova.define("cordova/plugin/BarcodeScanner",
function (require, exports, module) {
var exec = require("cordova/exec");
/**
@@ -88,4 +84,4 @@ cordova.define("cordova/plugin/BarcodeScanner",
var barcodeScanner = new BarcodeScanner();
module.exports = barcodeScanner;
});