You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2013/05/24 04:23:02 UTC
git commit: updated
Updated Branches:
refs/heads/master f8948fb0b -> 1f58ce6c0
updated
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/1f58ce6c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/1f58ce6c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/1f58ce6c
Branch: refs/heads/master
Commit: 1f58ce6c087f6a70530eab630888f00cde48c2d9
Parents: f8948fb
Author: Steven Gill <st...@gmail.com>
Authored: Thu May 23 19:22:57 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Thu May 23 19:22:57 2013 -0700
----------------------------------------------------------------------
plugin.xml | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/1f58ce6c/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 3fb1a1e..a9fef42 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -7,26 +7,26 @@ id="org.apache.cordova.core.CameraLauncher"
<name>Camera</name>
<js-module src="www/Camera.js" name="camera">
- <clobbers target="navigator.camera" />
+ <merges target="navigator.camera" />
</js-module>
<js-module src="www/CameraConstants.js" name="Camera">
- <clobbers target="Camera" />
+ <merges target="Camera" />
</js-module>
<js-module src="www/CameraPopoverOptions.js" name="CameraPopoverOptions">
- <clobbers target="CameraPopoverOptions" />
+ <merges target="CameraPopoverOptions" />
</js-module>
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
<merges target="CameraPopoverHandle" />
- </js-module>
+ </jsr-module>
<!-- android -->
<platform name="android">
<config-file target="res/xml/config.xml" parent="/*">
- <feature name="Camera">
- <param name="android-package" value="org.apache.cordova.core"/>
+ <feature name="Camera">
+ <param name="android-package" value="org.apache.cordova.core.CameraLauncher"/>
</feature>
</config-file>
@@ -37,13 +37,14 @@ id="org.apache.cordova.core.CameraLauncher"
<platform name="ios">
<config-file target="config.xml" parent="/*">
<feature name="Camera">
- <param name="ios-package" value="CDVCamera" />
+ <param name="ios-package" value="CDVCamera" />
</feature>
</config-file>
-
+ <!--
<js-module src="www/ios/CameraPopoverHandle.js" name="CameraPopoverHandle">
<merges target="CameraPopoverHandle" />
</js-module>
+ -->
<header-file src="src/ios/CDVCamera.h" />
<source-file src="src/ios/CDVCamera.m" />