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/06/29 03:57:51 UTC
[1/2] git commit: Fix CameraPopoverHandle module defined multiple
times on iOS
Updated Branches:
refs/heads/master a025cdd4e -> ea7bddac5
Fix CameraPopoverHandle module defined multiple times on iOS
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/ea7bddac
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/ea7bddac
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/ea7bddac
Branch: refs/heads/master
Commit: ea7bddac52a78f1bea6f5030e7e58f6048fc2237
Parents: ff587d4
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Jun 28 20:24:53 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Jun 28 21:39:07 2013 -0400
----------------------------------------------------------------------
plugin.xml | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/ea7bddac/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index 591f6c1..07f4e3b 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -11,9 +11,6 @@
<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>
@@ -30,6 +27,10 @@
</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 -->
@@ -56,6 +57,9 @@
<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 -->
@@ -71,6 +75,9 @@
</config-file>
<source-file src="src/wp7/Camera.cs" />
+
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ </js-module>
</platform>
<!-- wp8 -->
@@ -86,6 +93,9 @@
</config-file>
<source-file src="src/wp8/Camera.cs" />
+
+ <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+ </js-module>
</platform>
</plugin>
[2/2] git commit: Fix require paths that were broken by plugin id
changes
Posted by ag...@apache.org.
Fix require paths that were broken by plugin id changes
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/ff587d40
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/ff587d40
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/ff587d40
Branch: refs/heads/master
Commit: ff587d400e704fab28931f9e82db39863ef9c63f
Parents: a025cdd
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Jun 28 19:46:10 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Jun 28 21:39:07 2013 -0400
----------------------------------------------------------------------
docs/parameter/cameraError.md | 2 +-
docs/parameter/cameraSuccess.md | 2 +-
test/camera/index.html | 2 +-
www/Camera.js | 4 ++--
www/CameraPopoverOptions.js | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/ff587d40/docs/parameter/cameraError.md
----------------------------------------------------------------------
diff --git a/docs/parameter/cameraError.md b/docs/parameter/cameraError.md
index 7ee091b..f36840f 100644
--- a/docs/parameter/cameraError.md
+++ b/docs/parameter/cameraError.md
@@ -29,4 +29,4 @@ onError callback function that provides an error message.
Parameters
----------
-- __message:__ The message is provided by the device's native code. (`String`)
\ No newline at end of file
+- __message:__ The message is provided by the device's native code. (`String`)
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/ff587d40/docs/parameter/cameraSuccess.md
----------------------------------------------------------------------
diff --git a/docs/parameter/cameraSuccess.md b/docs/parameter/cameraSuccess.md
index 773fba4..e57b296 100644
--- a/docs/parameter/cameraSuccess.md
+++ b/docs/parameter/cameraSuccess.md
@@ -39,4 +39,4 @@ Example
function cameraCallback(imageData) {
var image = document.getElementById('myImage');
image.src = "data:image/jpeg;base64," + imageData;
- }
\ No newline at end of file
+ }
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/ff587d40/test/camera/index.html
----------------------------------------------------------------------
diff --git a/test/camera/index.html b/test/camera/index.html
index f761fbf..83285e7 100644
--- a/test/camera/index.html
+++ b/test/camera/index.html
@@ -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);
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/ff587d40/www/Camera.js
----------------------------------------------------------------------
diff --git a/www/Camera.js b/www/Camera.js
index d6af1e9..db34bb9 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.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 = {};
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/ff587d40/www/CameraPopoverOptions.js
----------------------------------------------------------------------
diff --git a/www/CameraPopoverOptions.js b/www/CameraPopoverOptions.js
index 36858a9..3d80930 100644
--- a/www/CameraPopoverOptions.js
+++ b/www/CameraPopoverOptions.js
@@ -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