Merge https://github.com/jsoref/incubator-cordova-bada
diff --git a/README.md b/README.md
index 92f5573..e42f7ec 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
4. Run cordova.bat under Res/cordova directory
5. Build&Run!
-Runnning in the simulator
+Running in the simulator
-------------------------
1. Right click on your project and select Build Configuration => Set Active => Simulator Debug in the Bada IDE
@@ -25,7 +25,7 @@
--------------------------
1. Follow [instructions](http://bit.ly/dK44XJ)
-2. Generate a new app on developer.bada.com, download the manifest.xml file and put it in the root dir of your app (overwritting the existing one).
+2. Generate a new app on developer.bada.com, download the manifest.xml file and put it in the root dir of your app (overwriting the existing one).
3. Right click on your project and select Build configuration => Set Active => Target Debug in the Bada IDE
4. Build&Run
diff --git a/Res/cordova/contact.js b/Res/cordova/contact.js
index 321b084..e036bc5 100644
--- a/Res/cordova/contact.js
+++ b/Res/cordova/contact.js
@@ -238,8 +238,8 @@
*/
var Contacts = function() {
this.inProgress = false;
- this.records = new Array(); // used by bada to create contacts
- this.results = new Array(); // used by bada to update contact results
+ this.records = new Array(); // used by Bada to create contacts
+ this.results = new Array(); // used by Bada to update contact results
this.resultsCallback = null;
this.errorCallback = null;
};
diff --git a/Res/cordova/cordova.js b/Res/cordova/cordova.js
index 81e42c3..e9031aa 100644
--- a/Res/cordova/cordova.js
+++ b/Res/cordova/cordova.js
@@ -926,7 +926,7 @@
/**
* Called by the geolocation framework when the reachability status has changed.
- * @param {Reachibility} reachability The current reachability status.
+ * @param {Reachability} reachability The current reachability status.
*/
// TODO: Callback from native code not implemented for Android
Network.prototype.updateReachability = function(reachability) {
@@ -1268,8 +1268,8 @@
*/
var Contacts = function() {
this.inProgress = false;
- this.records = new Array(); // used by bada to create contacts
- this.results = new Array(); // used by bada to update contact results
+ this.records = new Array(); // used by Bada to create contacts
+ this.results = new Array(); // used by Bada to update contact results
this.resultsCallback = null;
this.errorCallback = null;
};
diff --git a/Res/cordova/network.js b/Res/cordova/network.js
index d5b3b17..9600792 100644
--- a/Res/cordova/network.js
+++ b/Res/cordova/network.js
@@ -58,7 +58,7 @@
/**
* Called by the geolocation framework when the reachability status has changed.
- * @param {Reachibility} reachability The current reachability status.
+ * @param {Reachability} reachability The current reachability status.
*/
// TODO: Callback from native code not implemented for Android
Network.prototype.updateReachability = function(reachability) {
diff --git a/Res/main.js b/Res/main.js
index 83b5644..ba18369 100644
--- a/Res/main.js
+++ b/Res/main.js
@@ -172,7 +172,7 @@
'Device UUID: ' + device.uuid + '<br />' +
'Device Version: ' + device.version + '<br />';
} catch(e) {
- debugPrint("Error Occured: "+e.message);
+ debugPrint("Error Occurred: "+e.message);
}
}
@@ -222,7 +222,7 @@
contact.address.country = "Canada";
contact.save(onSuccess, onError);
} catch(e) {
- debugPrint("Error Occured: "+e.message);
+ debugPrint("Error Occurred: "+e.message);
}
}
@@ -242,7 +242,7 @@
};
navigator.service.contacts.find(["displayName", "firstName"], onSuccess, onFailure, {filter:"7789989674"});
} catch(e) {
- debugPrint("Error Occured: "+e.message);
+ debugPrint("Error Occurred: "+e.message);
}
}
@@ -260,7 +260,7 @@
contact.remove(onSuccess, onFailure);
}
} catch(e) {
- debugPrint("Error Occured in remove Contact: "+e.message);
+ debugPrint("Error Occurred in remove Contact: "+e.message);
}
}
@@ -385,6 +385,6 @@
}
navigator.camera.getPicture(successCallback, errorCallback, {});
} catch(e) {
- debugPring(e.message);
+ debugPrint(e.message);
}
}
diff --git a/src/Contacts.cpp b/src/Contacts.cpp
index 7a24f32..50ed8c7 100755
--- a/src/Contacts.cpp
+++ b/src/Contacts.cpp
@@ -54,7 +54,7 @@
}
AppLogDebug("Method %S callbackId %S contactId %d", method.GetPointer(), callbackId.GetPointer(), cid);
Create(cid);
- // Finding an exisiting contact by Name/Phone Number/Email
+ // Finding an existing contact by Name/Phone Number/Email
} else if(method == L"org.apache.cordova.Contacts.find" && !callbackId.IsEmpty()) {
String filter;
strTok.GetNextToken(filter);
diff --git a/src/CordovaEntry.cpp b/src/CordovaEntry.cpp
index c87a023..801b66a 100755
--- a/src/CordovaEntry.cpp
+++ b/src/CordovaEntry.cpp
@@ -29,7 +29,7 @@
_EXPORT_ int OspMain(int argc, char *pArgv[]);
/**
- * The entry function of bada application called by the operating system.
+ * The entry function of Bada application called by the operating system.
*/
int
OspMain(int argc, char *pArgv[])
