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/06/14 02:48:43 UTC
[1/2] git commit: modified plugin.xml
Updated Branches:
refs/heads/master 1eb52eb5e -> ac4e93c86
modified plugin.xml
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/abffce69
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/abffce69
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/abffce69
Branch: refs/heads/master
Commit: abffce698303759ea66712cb977a555502a25e58
Parents: 1eb52eb
Author: Steven Gill <st...@gmail.com>
Authored: Thu Jun 13 17:43:45 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Thu Jun 13 17:43:45 2013 -0700
----------------------------------------------------------------------
plugin.xml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/abffce69/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 1f7db02..48579a7 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -10,9 +10,7 @@ id="org.apache.cordova.core.CameraLauncher"
<clobbers target="Camera" />
</js-module>
- <js-module src="www/CameraPopoverOptions.js" name="CameraPopoverOptions">
- <clobbers target="CameraPopoverOptions" />
- </js-module>
+ <js-module src="www/CameraPopoverOptions.js" name="CameraPopoverOptions"></js-module>
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
</js-module>
@@ -40,8 +38,8 @@ id="org.apache.cordova.core.CameraLauncher"
</feature>
</config-file>
- <!-- <js-module src="www/ios/CameraPopoverHandle.js" name="CameraPopoverHandle"></js-module>
- -->
+ <js-module src="www/ios/CameraPopoverHandle.js" name="CameraPopoverHandle"></js-module>
+
<header-file src="src/ios/CDVCamera.h" />
<source-file src="src/ios/CDVCamera.m" />
[2/2] git commit: updated test file
Posted by st...@apache.org.
updated test file
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/ac4e93c8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/ac4e93c8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/ac4e93c8
Branch: refs/heads/master
Commit: ac4e93c86ebbfff9c12471e81ac3779b8f5f74d2
Parents: abffce6
Author: Steven Gill <st...@gmail.com>
Authored: Thu Jun 13 17:48:38 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Thu Jun 13 17:48:38 2013 -0700
----------------------------------------------------------------------
test/camera/index.html | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/ac4e93c8/test/camera/index.html
----------------------------------------------------------------------
diff --git a/test/camera/index.html b/test/camera/index.html
index 2d5eade..08a93f9 100644
--- a/test/camera/index.html
+++ b/test/camera/index.html
@@ -33,8 +33,8 @@
<script type="text/javascript" charset="utf-8">
var deviceReady = false;
- var platformId = cordova.require('cordova/platform').id;
- var CameraPopoverOptions = cordova.require('org.apache.cordova.CameraLauncher.CameraPopoverOptions');
+ var platformId = null;
+ var CameraPopoverOptions = null;
var pictureUrl = null;
var fileObj = null;
var fileEntry = null;
@@ -339,6 +339,8 @@
function init() {
document.addEventListener("deviceready", function() {
deviceReady = true;
+ platformId = cordova.require('cordova/platform').id;
+ CameraPopoverOptions = cordova.require('org.apache.cordova.CameraLauncher.CameraPopoverOptions');
console.log("Device="+device.platform+" "+device.version);
createOptionsEl('sourceType', Camera.PictureSourceType, camPictureSourceTypeDefault);
createOptionsEl('destinationType', Camera.DestinationType, camDestinationTypeDefault);