updating cordova.js to include camera constants fix. added clean dependency to build-javascript target in ant file

framework/assets/js/cordova.android.js

@@ -1435,78 +1435,85 @@ define('cordova/plugin/Camera', function(require, exports, module) {
 var exec = require('cordova/exec'),
     Camera = require('cordova/plugin/CameraConstants');
 
-module.exports = {
+var cameraExport = {};
-    /**
-     * Gets a picture from source defined by "options.sourceType", and returns the
-     * image as defined by the "options.destinationType" option.
 
-     * The defaults are sourceType=CAMERA and destinationType=FILE_URL.
+// Tack on the Camera Constants to the base camera plugin.
-     *
+for (var key in Camera) {
-     * @param {Function} successCallback
+    cameraExport[key] = Camera[key];
-     * @param {Function} errorCallback
+}
-     * @param {Object} options
-     */
-    getPicture: function (successCallback, errorCallback, options) {
 
-        // successCallback required
+/**
-        if (typeof successCallback != "function") {
+ * Gets a picture from source defined by "options.sourceType", and returns the
-            console.log("Camera Error: successCallback is not a function");
+ * image as defined by the "options.destinationType" option.
-            return;
-        }
 
-        // errorCallback optional
+ * The defaults are sourceType=CAMERA and destinationType=FILE_URL.
-        if (errorCallback && (typeof errorCallback != "function")) {
+ *
-            console.log("Camera Error: errorCallback is not a function");
+ * @param {Function} successCallback
-            return;
+ * @param {Function} errorCallback
-        }
+ * @param {Object} options
-
+ */
-        if (options && typeof options.quality == "number") {
+cameraExport.getPicture = function(successCallback, errorCallback, options) {
-            quality = options.quality;
+    // successCallback required
-        } else if (options && typeof options.quality == "string") {
+    if (typeof successCallback != "function") {
-            var qlity = parseInt(options.quality, 10);
+        console.log("Camera Error: successCallback is not a function");
-            if (isNaN(qlity) === false) {
+        return;
-                quality = qlity.valueOf();
-            }
-        }
-
-        var destinationType = Camera.DestinationType.FILE_URL;
-        if (options.destinationType) {
-            destinationType = options.destinationType;
-        }
-
-        var sourceType = Camera.PictureSourceType.CAMERA;
-        if (typeof options.sourceType == "number") {
-            sourceType = options.sourceType;
-        }
-
-        var targetWidth = -1;
-        if (typeof options.targetWidth == "number") {
-            targetWidth = options.targetWidth;
-        } else if (typeof options.targetWidth == "string") {
-            var width = parseInt(options.targetWidth, 10);
-            if (isNaN(width) === false) {
-                targetWidth = width.valueOf();
-            }
-        }
-
-        var targetHeight = -1;
-        if (typeof options.targetHeight == "number") {
-            targetHeight = options.targetHeight;
-        } else if (typeof options.targetHeight == "string") {
-            var height = parseInt(options.targetHeight, 10);
-            if (isNaN(height) === false) {
-                targetHeight = height.valueOf();
-            }
-        }
-
-        var encodingType = Camera.EncodingType.JPEG;
-        if (typeof options.encodingType == "number") {
-            encodingType = options.encodingType;
-        }
-
-        exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType]);
     }
-};
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback != "function")) {
+        console.log("Camera Error: errorCallback is not a function");
+        return;
+    }
+
+
+    if (options && typeof options.quality == "number") {
+        quality = options.quality;
+    } else if (options && typeof options.quality == "string") {
+        var qlity = parseInt(options.quality, 10);
+        if (isNaN(qlity) === false) {
+            quality = qlity.valueOf();
+        }
+    }
+
+    var destinationType = Camera.DestinationType.FILE_URL;
+    if (typeof options.destinationType == "number") {
+        destinationType = options.destinationType;
+    }
+
+    var sourceType = Camera.PictureSourceType.CAMERA;
+    if (typeof options.sourceType == "number") {
+        sourceType = options.sourceType;
+    }
+
+    var targetWidth = -1;
+    if (typeof options.targetWidth == "number") {
+        targetWidth = options.targetWidth;
+    } else if (typeof options.targetWidth == "string") {
+        var width = parseInt(options.targetWidth, 10);
+        if (isNaN(width) === false) {
+            targetWidth = width.valueOf();
+        }
+    }
+
+    var targetHeight = -1;
+    if (typeof options.targetHeight == "number") {
+        targetHeight = options.targetHeight;
+    } else if (typeof options.targetHeight == "string") {
+        var height = parseInt(options.targetHeight, 10);
+        if (isNaN(height) === false) {
+            targetHeight = height.valueOf();
+        }
+    }
+
+    var encodingType = Camera.EncodingType.JPEG;
+    if (typeof options.encodingType == "number") {
+        encodingType = options.encodingType;
+    }
+
+    exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType]);
+}
+
+module.exports = cameraExport;
 
 });
 

framework/build.xml

@@ -143,7 +143,7 @@
     </target>
 
     <!-- Combine JavaScript files into one cordova-uncompressed.js file. -->
-    <target name="build-javascript">
+    <target name="build-javascript" depends="clean">
         
       <!-- Clean up existing files -->
       <!--<delete file="assets/www/cordova_${version}.js"/>-->