You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2013/03/27 21:26:16 UTC
android commit: JS Changed once again,
this will require a retag of 2.6.0rc1
Updated Branches:
refs/heads/2.6.x b7e67ffb3 -> ff6ef1eea
Updated Tags: refs/tags/2.6.0rc1 85c25630a -> ff6ef1eea
JS Changed once again, this will require a retag of 2.6.0rc1
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/ff6ef1ee
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/ff6ef1ee
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/ff6ef1ee
Branch: refs/heads/2.6.x
Commit: ff6ef1eea5f6d2295ddd3a5b7cbf472302d05eb6
Parents: b7e67ff
Author: Joe Bowser <bo...@apache.org>
Authored: Wed Mar 27 13:25:53 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed Mar 27 13:25:53 2013 -0700
----------------------------------------------------------------------
framework/assets/js/cordova.android.js | 43 +++++++++++++++------------
1 files changed, 24 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ff6ef1ee/framework/assets/js/cordova.android.js
----------------------------------------------------------------------
diff --git a/framework/assets/js/cordova.android.js b/framework/assets/js/cordova.android.js
index a0c3278..5b0c1cf 100644
--- a/framework/assets/js/cordova.android.js
+++ b/framework/assets/js/cordova.android.js
@@ -1,8 +1,8 @@
// Platform: android
-// commit 47593b2bc1dba9bf46545b1da24577f937966e12
+// commit 104709b2130a29e7ad8596d1a6cee1ed48138803
-// File generated at :: Thu Mar 21 2013 10:49:00 GMT-0700 (PDT)
+// File generated at :: Wed Mar 27 2013 13:25:10 GMT-0700 (PDT)
/*
Licensed to the Apache Software Foundation (ASF) under one
@@ -6753,27 +6753,32 @@ window.cordova = require('cordova');
}
// 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));