github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-01-31 17:32:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fil Maj 2012-03-01 11:56:37 -08:00
parent 73aa5cc7c3
commit 7392b63b99
2 changed files with 76 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
framework/assets/js/cordova.android.js
View File

@ -1435,7 +1435,13 @@ define('cordova/plugin/Camera', function(require, exports, module) {
var exec = require('cordova/exec'), var exec = require('cordova/exec'),
Camera = require('cordova/plugin/CameraConstants'); Camera = require('cordova/plugin/CameraConstants');
module.exports = { var cameraExport = {};
// Tack on the Camera Constants to the base camera plugin.
for (var key in Camera) {
cameraExport[key] = Camera[key];
}
/** /**
* Gets a picture from source defined by "options.sourceType", and returns the * Gets a picture from source defined by "options.sourceType", and returns the
* image as defined by the "options.destinationType" option. * image as defined by the "options.destinationType" option.
@ -1446,8 +1452,7 @@ module.exports = {
* @param {Function} errorCallback * @param {Function} errorCallback
* @param {Object} options * @param {Object} options
*/ */
getPicture: function (successCallback, errorCallback, options) { cameraExport.getPicture = function(successCallback, errorCallback, options) {
// successCallback required // successCallback required
if (typeof successCallback != "function") { if (typeof successCallback != "function") {
console.log("Camera Error: successCallback is not a function"); console.log("Camera Error: successCallback is not a function");
@ -1460,6 +1465,7 @@ module.exports = {
return; return;
} }
if (options && typeof options.quality == "number") { if (options && typeof options.quality == "number") {
quality = options.quality; quality = options.quality;
} else if (options && typeof options.quality == "string") { } else if (options && typeof options.quality == "string") {
@ -1470,7 +1476,7 @@ module.exports = {
} }
var destinationType = Camera.DestinationType.FILE_URL; var destinationType = Camera.DestinationType.FILE_URL;
if (options.destinationType) { if (typeof options.destinationType == "number") {
destinationType = options.destinationType; destinationType = options.destinationType;
} }
@ -1506,7 +1512,8 @@ module.exports = {
exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType]); exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType]);
} }
};
module.exports = cameraExport;
}); });

2
framework/build.xml
View File

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