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

Use same option name as iPhone.

Browse Source
This commit is contained in:
Bryce Curtis 2010-09-16 12:47:13 -05:00
parent 92d2b5812c
commit 0895083f1f
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
framework/assets/js/camera.js
View File

@ -16,12 +16,13 @@ Camera = function() {
* Example: navigator.camera.getPicture(success, fail, * Example: navigator.camera.getPicture(success, fail,
* { quality: 80, * { quality: 80,
* destinationType: Camera.DestinationType.DATA_URL, * destinationType: Camera.DestinationType.DATA_URL,
* pictureSourceType: Camera.PictureSourceType.PHOTOLIBRARY}) * sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
*/ */
Camera.DestinationType = { Camera.DestinationType = {
DATA_URL: 0, // Return base64 encoded string DATA_URL: 0, // Return base64 encoded string
FILE_URI: 1 // Return file uri (content://media/external/images/media/2 for Android) FILE_URI: 1 // Return file uri (content://media/external/images/media/2 for Android)
}; };
Camera.prototype.DestinationType = Camera.DestinationType;
/** /**
* Source to getPicture from. * Source to getPicture from.
@ -29,19 +30,20 @@ Camera.DestinationType = {
* Example: navigator.camera.getPicture(success, fail, * Example: navigator.camera.getPicture(success, fail,
* { quality: 80, * { quality: 80,
* destinationType: Camera.DestinationType.DATA_URL, * destinationType: Camera.DestinationType.DATA_URL,
* pictureSourceType: Camera.PictureSourceType.PHOTOLIBRARY}) * sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
*/ */
Camera.PictureSourceType = { Camera.PictureSourceType = {
PHOTOLIBRARY : 0, // Choose image from picture library (same as SAVEDPHOTOALBUM for Android) PHOTOLIBRARY : 0, // Choose image from picture library (same as SAVEDPHOTOALBUM for Android)
CAMERA : 1, // Take picture from camera CAMERA : 1, // Take picture from camera
SAVEDPHOTOALBUM : 2 // Choose image from picture library (same as PHOTOLIBRARY for Android) SAVEDPHOTOALBUM : 2 // Choose image from picture library (same as PHOTOLIBRARY for Android)
}; };
Camera.prototype.PictureSourceType = Camera.PictureSourceType;
/** /**
* Gets a picture from source defined by "options.pictureSourceType", 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.
* The defaults are pictureSourceType=CAMERA and destinationType=DATA_URL. * The defaults are sourceType=CAMERA and destinationType=DATA_URL.
* *
* @param {Function} successCallback * @param {Function} successCallback
* @param {Function} errorCallback * @param {Function} errorCallback
@ -72,11 +74,11 @@ Camera.prototype.getPicture = function(successCallback, errorCallback, options)
if (this.options.destinationType) { if (this.options.destinationType) {
destinationType = this.options.destinationType; destinationType = this.options.destinationType;
} }
var pictureSourceType = Camera.PictureSourceType.CAMERA; var sourceType = Camera.PictureSourceType.CAMERA;
if (typeof this.options.pictureSourceType == "number") { if (typeof this.options.sourceType == "number") {
pictureSourceType = this.options.pictureSourceType; sourceType = this.options.sourceType;
} }
PhoneGap.execAsync(null, null, "Camera", "takePicture", [quality, destinationType, pictureSourceType]); PhoneGap.execAsync(null, null, "Camera", "takePicture", [quality, destinationType, sourceType]);
}; };
/** /**