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/08/20 00:03:00 UTC
[1/2] git commit: cleanup whitespace
Updated Branches:
refs/heads/dev 34101109a -> e5b70d944
cleanup whitespace
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/10df8b66
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/10df8b66
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/10df8b66
Branch: refs/heads/dev
Commit: 10df8b665215fff2f956d1863a49b7033f62024e
Parents: 7aa8aa8
Author: purplecabbage <pu...@gmail.com>
Authored: Thu Aug 15 15:01:14 2013 -0700
Committer: purplecabbage <pu...@gmail.com>
Committed: Thu Aug 15 15:01:14 2013 -0700
----------------------------------------------------------------------
plugin.xml | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/10df8b66/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 52803e2..7aaf660 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -40,17 +40,17 @@ xmlns:android="http://schemas.android.com/apk/res/android"
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
<clobbers target="CameraPopoverHandle" />
</js-module>
-
+
</platform>
-
+
<!-- ios -->
- <platform name="ios">
+ <platform name="ios">
<config-file target="config.xml" parent="/*">
<feature name="Camera">
<param name="ios-package" value="CDVCamera" />
</feature>
</config-file>
-
+
<js-module src="www/ios/CameraPopoverHandle.js" name="CameraPopoverHandle">
<clobbers target="CameraPopoverHandle" />
</js-module>
@@ -123,16 +123,20 @@ xmlns:android="http://schemas.android.com/apk/res/android"
<!-- windows8 -->
<platform name="windows8">
- <dependency id="org.apache.cordova.core.file" url="https://git-wip-us.apache.org/repos/asf/cordova-plugin-file" commit="master" subdir="/" />
-
+ <dependency id="org.apache.cordova.core.file"
+ url="https://git-wip-us.apache.org/repos/asf/cordova-plugin-file"
+ commit="master" subdir="/" />
+ <config-file target="package.appxmanifest" parent="/Package/Capabilities">
+ <Capability Name="picturesLibrary" />
+ <DeviceCapability Name="webcam" />
+ </config-file>
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
<clobbers target="CameraPopoverHandle" />
</js-module>
-
<js-module src="src/windows8/CameraProxy.js" name="CameraProxy">
<merges target="" />
</js-module>
</platform>
-
+
</plugin>
[2/2] git commit: Merge branch 'dev'
Posted by st...@apache.org.
Merge branch 'dev'
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/e5b70d94
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/e5b70d94
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/e5b70d94
Branch: refs/heads/dev
Commit: e5b70d944681a1da7dc620dd4bce73c44f7bf58b
Parents: 10df8b6 3410110
Author: Steven Gill <st...@gmail.com>
Authored: Mon Aug 19 14:31:12 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Mon Aug 19 14:31:12 2013 -0700
----------------------------------------------------------------------
README.md | 2 +-
plugin.xml | 13 ++++++-------
src/android/CameraLauncher.java | 2 +-
3 files changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/e5b70d94/plugin.xml
----------------------------------------------------------------------