Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-camera

Conflicts:
	plugin.xml

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`)
+- __message:__ The message is provided by the device's native code. (`String`)

docs/parameter/cameraSuccess.md

@@ -39,4 +39,4 @@ Example
     function cameraCallback(imageData) {
         var image = document.getElementById('myImage');
         image.src = "data:image/jpeg;base64," + imageData;
-    }
+    }

plugin.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
-xmlns:android="http://schemas.android.com/apk/res/android"
-id="org.apache.cordova.core.CameraLauncher"
-    version="0.1.0">
+           id="org.apache.cordova.core.camera"
+      version="0.1.0">
     <name>Camera</name>
    
     <js-module src="www/CameraConstants.js" name="Camera">
@@ -12,9 +11,6 @@ id="org.apache.cordova.core.CameraLauncher"
 
     <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>
@@ -31,6 +27,10 @@ id="org.apache.cordova.core.CameraLauncher"
         </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 -->
@@ -57,6 +57,9 @@ id="org.apache.cordova.core.CameraLauncher"
         <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 -->
@@ -72,6 +75,10 @@ id="org.apache.cordova.core.CameraLauncher"
         </config-file>
 
         <source-file src="src/wp/Camera.cs" />
+
+
+        <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+        </js-module>
     </platform>
 
     <!-- wp8 -->
@@ -87,6 +94,9 @@ id="org.apache.cordova.core.CameraLauncher"
         </config-file>
 
         <source-file src="src/wp/Camera.cs" />
+
+        <js-module src="www/CameraPopoverHandle.js" name="CameraPopoverHandle">
+        </js-module>
     </platform>
           
 </plugin>

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);

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 = {};
 

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