You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ti...@apache.org on 2013/03/27 23:25:25 UTC
[1/2] webworks commit: [CB-2766] - updated version
Updated Branches:
refs/heads/2.6.x af26b12a3 -> f01e62913
[CB-2766] - updated version
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/f01e6291
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/f01e6291
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/f01e6291
Branch: refs/heads/2.6.x
Commit: f01e629138f340ab0899ffbf7b303883080c36b3
Parents: 88372d1
Author: Tim Kim <ti...@adobe.com>
Authored: Wed Mar 27 15:19:35 2013 -0700
Committer: Tim Kim <ti...@adobe.com>
Committed: Wed Mar 27 15:24:19 2013 -0700
----------------------------------------------------------------------
VERSION | 2 +-
bin/templates/project/www/VERSION | 2 +-
bin/templates/project/www/index.html | 2 +-
.../ext/src/org/apache/cordova/device/Device.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/f01e6291/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 437459c..f47de85 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5.0
+2.6.0rc1
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/f01e6291/bin/templates/project/www/VERSION
----------------------------------------------------------------------
diff --git a/bin/templates/project/www/VERSION b/bin/templates/project/www/VERSION
index 437459c..f47de85 100644
--- a/bin/templates/project/www/VERSION
+++ b/bin/templates/project/www/VERSION
@@ -1 +1 @@
-2.5.0
+2.6.0rc1
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/f01e6291/bin/templates/project/www/index.html
----------------------------------------------------------------------
diff --git a/bin/templates/project/www/index.html b/bin/templates/project/www/index.html
index 6b53abc..15abf33 100644
--- a/bin/templates/project/www/index.html
+++ b/bin/templates/project/www/index.html
@@ -33,7 +33,7 @@
<p class="event received">Device is Ready</p>
</div>
</div>
- <script type="text/javascript" src="cordova-2.5.0.js"></script>
+ <script type="text/javascript" src="cordova-2.6.0rc1.js"></script>
<script type="text/javascript" src="js/index.js"></script>
<script type="text/javascript">
app.initialize();
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/f01e6291/framework/ext/src/org/apache/cordova/device/Device.java
----------------------------------------------------------------------
diff --git a/framework/ext/src/org/apache/cordova/device/Device.java b/framework/ext/src/org/apache/cordova/device/Device.java
index 3bb4824..7b67a8b 100644
--- a/framework/ext/src/org/apache/cordova/device/Device.java
+++ b/framework/ext/src/org/apache/cordova/device/Device.java
@@ -54,7 +54,7 @@ public final class Device extends Plugin {
JSONObject device = new JSONObject();
device.put( FIELD_PLATFORM, "BlackBerry");
device.put( FIELD_UUID, new Integer( DeviceInfo.getDeviceId()) );
- device.put( FIELD_CORDOVA, "2.5.0" );
+ device.put( FIELD_CORDOVA, "2.6.0rc1" );
device.put( FIELD_MODEL, new String(DeviceInfo.getDeviceName()) );
device.put( FIELD_NAME, new String(DeviceInfo.getDeviceName()) );
device.put( FIELD_VERSION, new String(DeviceInfo.getSoftwareVersion()) );
[2/2] webworks commit: [CB-2745] - updating javascript again
Posted by ti...@apache.org.
[CB-2745] - updating javascript again
Project: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/commit/88372d1a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/tree/88372d1a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-blackberry/diff/88372d1a
Branch: refs/heads/2.6.x
Commit: 88372d1acc8650895f7efab02f952f8e19ac0279
Parents: af26b12
Author: Tim Kim <ti...@adobe.com>
Authored: Wed Mar 27 14:18:58 2013 -0700
Committer: Tim Kim <ti...@adobe.com>
Committed: Wed Mar 27 15:24:19 2013 -0700
----------------------------------------------------------------------
javascript/cordova.blackberry.js | 47 ++++++++++++++++++--------------
1 files changed, 26 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-blackberry/blob/88372d1a/javascript/cordova.blackberry.js
----------------------------------------------------------------------
diff --git a/javascript/cordova.blackberry.js b/javascript/cordova.blackberry.js
index fbe61f5..6df67ea 100644
--- a/javascript/cordova.blackberry.js
+++ b/javascript/cordova.blackberry.js
@@ -1,8 +1,8 @@
// Platform: blackberry
-// commit bbf1562d4934b1331ffb263424b6ae054cedeb71
+// commit 104709b2130a29e7ad8596d1a6cee1ed48138803
-// File generated at :: Fri Mar 22 2013 14:49:45 GMT-0700 (PDT)
+// File generated at :: Wed Mar 27 2013 13:50:52 GMT-0700 (PDT)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -5361,7 +5361,7 @@ module.exports = {
model: "PlayBook",
name: "PlayBook", // deprecated: please use device.model
uuid: info.uuid,
- cordova: "2.5.0"
+ cordova: "2.6.0rc1"
});
}),
request = new blackberry.transport.RemoteFunctionCall("org/apache/cordova/getDeviceInfo");
@@ -9290,7 +9290,7 @@ module.exports = {
model: "Dev Alpha",
name: "Dev Alpha", // deprecated: please use device.model
uuid: blackberry.identity.uuid,
- cordova: "2.5.0"
+ cordova: "2.6.0rc1"
});
return { "status" : cordova.callbackStatus.NO_RESULT, "message" : "Device info returned" };
@@ -10824,27 +10824,32 @@ document.addEventListener("DOMContentLoaded", function () {
}
// Try to XHR the cordova_plugins.json file asynchronously.
- var xhr = new context.XMLHttpRequest();
- xhr.onreadystatechange = function() {
- if (this.readyState != 4) { // not DONE
- return;
- }
+ try { // we commented we were going to try, so let us actually try and catch
+ var xhr = new context.XMLHttpRequest();
+ xhr.onreadystatechange = function() {
+ if (this.readyState != 4) { // not DONE
+ return;
+ }
- // If the response is a JSON string which composes an array, call handlePluginsObject.
- // If the request fails, or the response is not a JSON array, just call finishPluginLoading.
- if (this.status == 200) {
- var obj = JSON.parse(this.responseText);
- if (obj && obj instanceof Array && obj.length > 0) {
- handlePluginsObject(obj);
+ // If the response is a JSON string which composes an array, call handlePluginsObject.
+ // If the request fails, or the response is not a JSON array, just call finishPluginLoading.
+ if (this.status == 200) {
+ var obj = JSON.parse(this.responseText);
+ if (obj && obj instanceof Array && obj.length > 0) {
+ handlePluginsObject(obj);
+ } else {
+ finishPluginLoading();
+ }
} else {
finishPluginLoading();
}
- } else {
- finishPluginLoading();
- }
- };
- xhr.open('GET', 'cordova_plugins.json', true); // Async
- xhr.send();
+ };
+ xhr.open('GET', 'cordova_plugins.json', true); // Async
+ xhr.send();
+ }
+ catch(err) {
+ finishPluginLoading();
+ }
}(window));