github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-05-30 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with DATA_URL and refactor code

Browse Source
This commit is contained in:
macdonst
2011-09-30 11:30:04 -04:00
parent 6098f46d08
commit 80695ec5e4
2 changed files with 44 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/assets/js/camera.js
+23 -33
View File
@@ -105,56 +105,46 @@ Camera.prototype.getPicture = function(successCallback, errorCallback, options)
console.log("Camera Error: errorCallback is not a function");
return;
}
this.options = options;
var quality = 80;
if (options.quality) {
quality = this.options.quality;
}
var maxResolution = 0;
if (options.maxResolution) {
maxResolution = this.options.maxResolution;
if (!options) {
options = {};
}
var destinationType = Camera.DestinationType.DATA_URL;
if (this.options.destinationType) {
destinationType = this.options.destinationType;
if (!options.quality) {
options.quality = 80;
}
var sourceType = Camera.PictureSourceType.CAMERA;
if (typeof this.options.sourceType === "number") {
sourceType = this.options.sourceType;
if (!options.maxResolution) {
options.maxResolution = 0;
}
var encodingType = Camera.EncodingType.JPEG;
if (typeof options.encodingType == "number") {
encodingType = this.options.encodingType;
if (!options.destinationType) {
options.destinationType = Camera.DestinationType.DATA_URL;
}
var mediaType = Camera.MediaType.PICTURE;
if (typeof options.mediaType == "number") {
mediaType = this.options.mediaType;
if (!options.sourceType) {
options.sourceType = Camera.PictureSourceType.CAMERA;
}
var targetWidth = -1;
if (typeof options.targetWidth == "number") {
targetWidth = options.targetWidth;
if (!options.encodingType) {
options.encodingType = Camera.EncodingType.JPEG;
}
if (!options.mediaType) {
options.mediaType = Camera.MediaType.PICTURE;
}
if (!options.targetWidth) {
options.targetWidth = -1;
} else if (typeof options.targetWidth == "string") {
var width = new Number(options.targetWidth);
if (isNaN(width) === false) {
targetWidth = width.valueOf();
options.targetWidth = width.valueOf();
}
}
var targetHeight = -1;
if (typeof options.targetHeight == "number") {
targetHeight = options.targetHeight;
if (!options.targetHeight) {
options.targetHeight = -1;
} else if (typeof options.targetHeight == "string") {
var height = new Number(options.targetHeight);
if (isNaN(height) === false) {
targetHeight = height.valueOf();
options.targetHeight = height.valueOf();
}
}
PhoneGap.exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType, mediaType]);
PhoneGap.exec(successCallback, errorCallback, "Camera", "takePicture", [options]);
};
PhoneGap.addConstructor(function() {