You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/07/09 20:40:32 UTC
[1/2] git commit: [CB-4131] Use relative require paths in camera
files.
Updated Branches:
refs/heads/master ad6b9fa3f -> ba9b568c5
[CB-4131] Use relative require paths in camera files.
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/ba9b568c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/ba9b568c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/ba9b568c
Branch: refs/heads/master
Commit: ba9b568c5d4c05e75dcf340f2c231fa8565ac42f
Parents: 311f3f6
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Jul 9 14:39:05 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Jul 9 14:39:49 2013 -0400
----------------------------------------------------------------------
www/Camera.js | 4 ++--
www/CameraPopoverOptions.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/ba9b568c/www/Camera.js
----------------------------------------------------------------------
diff --git a/www/Camera.js b/www/Camera.js
index db34bb9..b2da5da 100644
--- a/www/Camera.js
+++ b/www/Camera.js
@@ -21,8 +21,8 @@
var argscheck = require('cordova/argscheck'),
exec = require('cordova/exec'),
- Camera = require('org.apache.cordova.core.camera.Camera'),
- CameraPopoverHandle = require('org.apache.cordova.core.camera.CameraPopoverHandle');
+ Camera = require('./Camera'),
+ CameraPopoverHandle = require('./CameraPopoverHandle');
var cameraExport = {};
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/ba9b568c/www/CameraPopoverOptions.js
----------------------------------------------------------------------
diff --git a/www/CameraPopoverOptions.js b/www/CameraPopoverOptions.js
index 3d80930..c024984 100644
--- a/www/CameraPopoverOptions.js
+++ b/www/CameraPopoverOptions.js
@@ -19,7 +19,7 @@
*
*/
-var Camera = require('org.apache.cordova.core.camera.Camera');
+var Camera = require('./Camera');
/**
* Encapsulates options for iOS Popover image picker
[2/2] git commit: Add symbol paths for CameraPopoverOptions and
CameraPopoverHandle
Posted by ag...@apache.org.
Add symbol paths for CameraPopoverOptions and CameraPopoverHandle
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/311f3f6c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/311f3f6c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/311f3f6c
Branch: refs/heads/master
Commit: 311f3f6c567969b286bc7d34954da13df8d39390
Parents: ad6b9fa
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue Jul 9 14:38:37 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue Jul 9 14:39:49 2013 -0400
----------------------------------------------------------------------
plugin.xml | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/311f3f6c/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index da9633c..8fbab68 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -4,17 +4,19 @@
id="org.apache.cordova.core.camera"
version="0.1.0">
<name>Camera</name>
-
+
<js-module src="www/CameraConstants.js" name="Camera">
<clobbers target="Camera" />
</js-module>
- <js-module src="www/CameraPopoverOptions.js" name="CameraPopoverOptions"></js-module>
+ <js-module src="www/CameraPopoverOptions.js" name="CameraPopoverOptions">
+ <clobbers target="CameraPopoverOptions" />
+ </js-module>
<js-module src="www/Camera.js" name="camera">
<clobbers target="navigator.camera" />
</js-module>
-
+
<!-- android -->
<platform name="android">
<config-file target="res/xml/config.xml" parent="/*">
@@ -29,6 +31,7 @@
<source-file src="src/android/CameraLauncher.java" target-dir="src/org/apache/cordova/core" />
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle" />
</js-module>
</platform>
@@ -41,8 +44,9 @@
</feature>
</config-file>
- <js-module src="www/ios/CameraPopoverHandle.js" name="CameraPopoverHandle"></js-module>
-
+ <js-module src="www/ios/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle" />
+ </js-module>
<header-file src="src/ios/CDVCamera.h" />
<source-file src="src/ios/CDVCamera.m" />
@@ -59,6 +63,7 @@
</config-file>
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle" />
</js-module>
</platform>
@@ -78,6 +83,7 @@
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle" />
</js-module>
</platform>
@@ -96,6 +102,7 @@
<source-file src="src/wp/Camera.cs" />
<js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ <clobbers target="CameraPopoverHandle" />
</js-module>
</platform>