You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by gt...@apache.org on 2012/11/05 16:55:13 UTC
js commit: Wait for DOMContentLoaded for booting of BlackBerry (BB10
requires this)
Updated Branches:
refs/heads/master 0919268c2 -> 08f7fe4ae
Wait for DOMContentLoaded for booting of BlackBerry (BB10 requires this)
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/commit/08f7fe4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/08f7fe4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/08f7fe4a
Branch: refs/heads/master
Commit: 08f7fe4ae4a28552ff28e6b2a774ccb9df9bf223
Parents: 0919268
Author: Gord Tanner <gt...@gmail.com>
Authored: Mon Nov 5 10:54:43 2012 -0500
Committer: Gord Tanner <gt...@gmail.com>
Committed: Mon Nov 5 10:54:43 2012 -0500
----------------------------------------------------------------------
lib/blackberry/platform.js | 7 +++----
lib/scripts/bootstrap-blackberry.js | 27 ++++++++++++++-------------
2 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/08f7fe4a/lib/blackberry/platform.js
----------------------------------------------------------------------
diff --git a/lib/blackberry/platform.js b/lib/blackberry/platform.js
index 90bbde8..5ca3e32 100644
--- a/lib/blackberry/platform.js
+++ b/lib/blackberry/platform.js
@@ -22,12 +22,11 @@
module.exports = {
id: "blackberry",
runtime: function () {
- var version = blackberry.system.softwareVersion;
- window.wtf = version;
- if (version.match(/^10/)) {
+ if (window.webworks) {
return 'qnx';
}
- else if (version.match(/^BlackBerry/)) {
+ var version = blackberry.system.softwareVersion;
+ if (version.match(/^BlackBerry/)) {
return 'air';
}
else {
http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/08f7fe4a/lib/scripts/bootstrap-blackberry.js
----------------------------------------------------------------------
diff --git a/lib/scripts/bootstrap-blackberry.js b/lib/scripts/bootstrap-blackberry.js
index 58f0f51..7077af3 100644
--- a/lib/scripts/bootstrap-blackberry.js
+++ b/lib/scripts/bootstrap-blackberry.js
@@ -19,17 +19,18 @@
*
*/
-switch(require('cordova/platform').runtime()) {
-case 'qnx':
- console.log('booting!');
- document.addEventListener("webworksready", function () {
+document.addEventListener("DOMContentLoaded", function () {
+ switch(require('cordova/platform').runtime()) {
+ case 'qnx':
+ document.addEventListener("webworksready", function () {
+ require('cordova/channel').onNativeReady.fire();
+ });
+ break;
+ case 'air':
require('cordova/channel').onNativeReady.fire();
- });
- break;
-case 'air':
- require('cordova/channel').onNativeReady.fire();
- break;
-case 'java':
- //nothing to do for java
- break;
-}
+ break;
+ case 'java':
+ //nothing to do for java
+ break;
+ }
+});