[js] cordova.require instead of PhoneGap.require

README.md

@@ -47,7 +47,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:
-```
+
    var scanner = cordova.require("cordova/plugin/BarcodeScanner");
 
    scanner.scan(
@@ -61,7 +61,7 @@ A full example could be:
           alert("Scanning failed: " + error);
       }
    );
-```
+
 
 ## Encoding a Barcode ##
 The plugin creates the object `window.plugins.barcodeScanner` with the method `encode(type, data, success, fail)`. 
@@ -72,7 +72,6 @@ Supported encoding types:
 * PHONE_TYPE
 * SMS_TYPE
 
-```
 A full example could be:
 
    var scanner = cordova.require("cordova/plugin/BarcodeScanner");
@@ -83,7 +82,6 @@ A full example could be:
   	        alert("encoding failed: " + fail);
   	      }
   	    );
-```
 
 ## Thanks on Github ##
 
@@ -112,4 +110,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

plugin.xml

@@ -2,7 +2,7 @@
 <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.5.3">
+    version="0.5.1">
 
     <name>BarcodeScanner</name>
 

spec/barcodescanner.tests.js

@@ -19,39 +19,35 @@
  *
 */
 
-var scanner;
-
-describe('cordova.require object should exist', function () {
+describe('Plugin object (window.plugins)', function () {
 	it("should exist", function() {
-        expect(window.cordova).toBeDefined();
-        expect(typeof cordova.require == 'function').toBe(true);
+        expect(window.plugins).toBeDefined();
 	});
 
-	it("BarcodeScanner plugin should exist", function() {
-        scanner = cordova.require("cordova/plugin/BarcodeScanner")
-        expect(scanner).toBeDefined();
-		expect(typeof scanner == 'object').toBe(true);
+	it("should contain a barcodeScanner object", function() {
+        expect(window.plugins.barcodeScanner).toBeDefined();
+		expect(typeof window.plugins.barcodeScanner == 'object').toBe(true);
 	});
 
     it("should contain a scan function", function() {
-        expect(scanner.scan).toBeDefined();
-        expect(typeof scanner.scan == 'function').toBe(true);
+        expect(window.plugins.barcodeScanner.scan).toBeDefined();
+        expect(typeof window.plugins.barcodeScanner.scan == 'function').toBe(true);
     });
 
     it("should contain an encode function", function() {
-        expect(scanner.encode).toBeDefined();
-        expect(typeof scanner.encode == 'function').toBe(true);
+        expect(window.plugins.barcodeScanner.encode).toBeDefined();
+        expect(typeof window.plugins.barcodeScanner.encode == 'function').toBe(true);
     });
 
     it("should contain three DestinationType constants", function() {
-        expect(scanner.Encode.TEXT_TYPE).toBe("TEXT_TYPE");
-        expect(scanner.Encode.EMAIL_TYPE).toBe("EMAIL_TYPE");
-        expect(scanner.Encode.PHONE_TYPE).toBe("PHONE_TYPE");
-        expect(scanner.Encode.SMS_TYPE).toBe("SMS_TYPE");
+        expect(BarcodeScanner.Encode.TEXT_TYPE).toBe("TEXT_TYPE");
+        expect(BarcodeScanner.Encode.EMAIL_TYPE).toBe("EMAIL_TYPE");
+        expect(BarcodeScanner.Encode.PHONE_TYPE).toBe("PHONE_TYPE");
+        expect(BarcodeScanner.Encode.SMS_TYPE).toBe("SMS_TYPE");
     });
     /*
     it("should call scan successfully", function() {
-        scanner.scan(function() {}, function() {});
+        window.plugins.barcodeScanner.scan(function() {}, function() {});
     });
     */
 });

spec/config.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widget xmlns     = "http://www.w3.org/ns/widgets"
+        xmlns:gap = "http://phonegap.com/ns/1.0"
+        id        = "org.apache.cordova.example"
+        version   = "2.0.0">
+    <name>cordovaExample</name>
+
+    <description>
+        Barcode Scanner Spec
+    </description>
+
+    <author href="http://phonegap.com" email="support@phonegap.com">
+        Ryan Willoughby - PhoneGap Team
+    </author>
+
+    <gap:preference name="phonegap-version" value="2.5.0" />
+
+    <gap:plugin name="BarcodeScanner"/>
+
+</widget>

www/barcodescanner.js

@@ -54,12 +54,12 @@ cordova.define("cordova/plugin/BarcodeScanner",
             }
 
             if (typeof errorCallback != "function") {
-                console.log("BarcodeScanner.encode failure: failure parameter not a function");
+                console.log("BarcodeScanner.scan failure: failure parameter not a function");
                 return
             }
 
             if (typeof successCallback != "function") {
-                console.log("BarcodeScanner.encode failure: success callback parameter must be a function");
+                console.log("BarcodeScanner.scan failure: success callback parameter must be a function");
                 return
             }