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 <[email protected]> Authored: Fri Jun 28 20:24:53 2013 -0400 Committer: Andrew Grieve <[email protected]> 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>
