github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-01-19 07:02: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

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

@ -1435,78 +1435,85 @@ define('cordova/plugin/Camera', function(require, exports, module) {
var exec = require('cordova/exec'),
Camera = require('cordova/plugin/CameraConstants');
module.exports = {
/**
* Gets a picture from source defined by "options.sourceType", and returns the
* image as defined by the "options.destinationType" option.
var cameraExport = {};
* The defaults are sourceType=CAMERA and destinationType=FILE_URL.
*
* @param {Function} successCallback
* @param {Function} errorCallback
* @param {Object} options
*/
getPicture: function (successCallback, errorCallback, options) {
// Tack on the Camera Constants to the base camera plugin.
for (var key in Camera) {
cameraExport[key] = Camera[key];
}
// successCallback required
if (typeof successCallback != "function") {
console.log("Camera Error: successCallback is not a function");
return;
}
/**
* Gets a picture from source defined by "options.sourceType", and returns the
* image as defined by the "options.destinationType" option.
// 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 (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]);
* The defaults are sourceType=CAMERA and destinationType=FILE_URL.
*
* @param {Function} successCallback
* @param {Function} errorCallback
* @param {Object} options
*/
cameraExport.getPicture = function(successCallback, errorCallback, options) {
// successCallback required
if (typeof successCallback != "function") {
console.log("Camera Error: successCallback is not a function");
return;
}
};
// 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;
});

2
framework/build.xml
View File

@ -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"/>-->