Merge branch 'master' of git@github.com:phonegap/phonegap

Conflicts:
	iphone

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "iphone/PhoneGapLibTest/www"]
-	path = iphone/PhoneGapLibTest/www
-	url = git://github.com/phonegap/mobile-spec.git
+[submodule "iphone"]
+	path = iphone
+	url = git://github.com/phonegap/phonegap-iphone.git

README.md

@@ -29,6 +29,16 @@ offers one unified API for accessing core functionality on all
 devices. Where possible, phonegap follows the **HTML5 spec**.
 
 
+PhoneGap-iPhone
+-------------------------------------------------------------
+The main repo is at http://github.com/phonegap/phonegap-iphone it is
+submoduled into this project.
+
+To get the submodule, from a command prompt, while in the root folder of phonegap:
+1) git submodule init
+2) git submodule update
+
+
 API
 -------------------------------------------------------------
 

blackberry/framework/phonegap.jdp

@@ -26,11 +26,13 @@ src\com\nitobi\phonegap\api\CommandManager.java
 src\com\nitobi\phonegap\api\impl\CameraCommand.java
 src\com\nitobi\phonegap\api\impl\ContactsCommand.java
 src\com\nitobi\phonegap\api\impl\DeviceCommand.java
+src\com\nitobi\phonegap\api\impl\ExitCommand.java
 src\com\nitobi\phonegap\api\impl\GeoLocationCommand.java
 src\com\nitobi\phonegap\api\impl\MediaCommand.java
 src\com\nitobi\phonegap\api\impl\NetworkCommand.java
 src\com\nitobi\phonegap\api\impl\NotificationCommand.java
 src\com\nitobi\phonegap\api\impl\OrientationCommand.java
+src\com\nitobi\phonegap\api\impl\SMSCommand.java
 src\com\nitobi\phonegap\api\impl\TelephonyCommand.java
 src\com\nitobi\phonegap\io\AsynchronousResourceFetcher.java
 src\com\nitobi\phonegap\io\Callback.java

blackberry/framework/src/www/phonegap.js

@@ -479,8 +479,9 @@ Geolocation.prototype.stop = function() {
 /**
  * Maps current location
  */
-Geolocation.prototype.map = function() {
-	if (this.lastPosition == null) {
+if (typeof navigator.map == "undefined") navigator.map = {};
+navigator.map.show = function() {
+	if (navigator.geolocation.lastPosition == null) {
 		alert("[PhoneGap] No position to map yet.");
 		return;
 	} else {

blackberry/js/geolocation.js

@@ -139,8 +139,9 @@ Geolocation.prototype.stop = function() {
 /**
  * Maps current location
  */
-Geolocation.prototype.map = function() {
-	if (this.lastPosition == null) {
+if (typeof navigator.map == "undefined") navigator.map = {};
+navigator.map.show = function() {
+	if (navigator.geolocation.lastPosition == null) {
 		alert("[PhoneGap] No position to map yet.");
 		return;
 	} else {

blackberry/js/media.js

@@ -1,19 +1,19 @@
 /**
- * This class provides access to the device media, interfaces to both sound and video
+ * This class provides access to the device audio.
  * @constructor
  */
-function Media(src, successCallback, errorCallback) {
+function Audio(src) {
 	this.src = src;
-	this.successCallback = successCallback;
-	this.errorCallback = errorCallback;												
+	this.loop = false;
+	this.error = null;
 }
 
 /**
  * This class contains information about any Media errors.
  * @constructor
  */
 function MediaError() {
-	this.code = null,
+	this.code = null;
 	this.message = "";
 }
 
@@ -22,14 +22,8 @@ MediaError.MEDIA_ERR_NETWORK 		= 2;
 MediaError.MEDIA_ERR_DECODE 		= 3;
 MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
 
-
-//if (typeof navigator.audio == "undefined") navigator.audio = new Media(src);
-
-Media.prototype.record = function() {
-	alert('Media recording not implemented - yet.');
-};
-
-Media.prototype.play = function() {
+Media.prototype.play = function(successCallback, errorCallback) {
+
 	PhoneGap.exec("media",[this.src]);
 };