github/cordova-plugin-camera
github/cordova-plugin-camera
3
0
Fork 0
mirror of https://github.com/apache/cordova-plugin-camera.git synced 2025-01-18 19:22:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera

Browse Source 
Conflicts:
	plugin.xml
This commit is contained in:
Jesse MacFadyen 2013-07-08 14:53:49 -07:00
commit ad6b9fa3fd
6 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugin.xml
View File

@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="org.apache.cordova.core.CameraLauncher"
id="org.apache.cordova.core.camera"
version="0.1.0">
<name>Camera</name>
@ -12,9 +11,6 @@ id="org.apache.cordova.core.CameraLauncher"
<js-module src="www/CameraPopoverOptions.js" name="CameraPopoverOptions"></js-module>
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
</js-module>
<js-module src="www/Camera.js" name="camera">
<clobbers target="navigator.camera" />
</js-module>
@ -31,6 +27,10 @@ id="org.apache.cordova.core.CameraLauncher"
</config-file>
<source-file src="src/android/CameraLauncher.java" target-dir="src/org/apache/cordova/core" />
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
</js-module>
</platform>
<!-- ios -->
@ -57,6 +57,9 @@ id="org.apache.cordova.core.CameraLauncher"
<config-file target="www/config.xml" parent="/widget">
<feature name="Camera" value="Camera"/>
</config-file>
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
</js-module>
</platform>
<!-- wp7 -->
@ -72,6 +75,10 @@ id="org.apache.cordova.core.CameraLauncher"
</config-file>
<source-file src="src/wp/Camera.cs" />
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
</js-module>
</platform>
<!-- wp8 -->
@ -87,6 +94,9 @@ id="org.apache.cordova.core.CameraLauncher"
</config-file>
<source-file src="src/wp/Camera.cs" />
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
</js-module>
</platform>
</plugin>

2
test/camera/index.html
View File

@ -340,7 +340,7 @@
document.addEventListener("deviceready", function() {
deviceReady = true;
platformId = cordova.require('cordova/platform').id;
CameraPopoverOptions = cordova.require('org.apache.cordova.core.CameraLauncher.CameraPopoverOptions');
CameraPopoverOptions = cordova.require('org.apache.cordova.core.camera.CameraPopoverOptions');
console.log("Device="+device.platform+" "+device.version);
createOptionsEl('sourceType', Camera.PictureSourceType, camPictureSourceTypeDefault);
createOptionsEl('destinationType', Camera.DestinationType, camDestinationTypeDefault);

4
www/Camera.js
View File

@ -21,8 +21,8 @@
var argscheck = require('cordova/argscheck'),
exec = require('cordova/exec'),
Camera = require('org.apache.cordova.core.CameraLauncher.Camera'),
CameraPopoverHandle = require('org.apache.cordova.core.CameraLauncher.CameraPopoverHandle');
Camera = require('org.apache.cordova.core.camera.Camera'),
CameraPopoverHandle = require('org.apache.cordova.core.camera.CameraPopoverHandle');
var cameraExport = {};

2
www/CameraPopoverOptions.js
View File

@ -19,7 +19,7 @@
*
*/
var Camera = require('org.apache.cordova.core.CameraLauncher.Camera');
var Camera = require('org.apache.cordova.core.camera.Camera');
/**
* Encapsulates options for iOS Popover image picker