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/07/19 02:25:46 UTC
android commit: Incrementing version to 3.0.0, ready for tagging
Updated Branches:
refs/heads/3.0.x d91ac45d8 -> d0b3f419e
Updated Tags: refs/tags/3.0.0 [created] d0b3f419e
Incrementing version to 3.0.0, ready for tagging
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/d0b3f419
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/d0b3f419
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/d0b3f419
Branch: refs/heads/3.0.x
Commit: d0b3f419efb0e364879b79139936a1a8a9ff6459
Parents: d91ac45
Author: Joe Bowser <bo...@apache.org>
Authored: Thu Jul 18 17:25:18 2013 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Thu Jul 18 17:25:18 2013 -0700
----------------------------------------------------------------------
VERSION | 2 +-
bin/templates/cordova/version | 2 +-
framework/assets/www/cordova.js | 6 +++---
test/assets/www/cordova.js | 11 ++++++++---
4 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/d0b3f419/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 11d421a..4a36342 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.0rc1
+3.0.0
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/d0b3f419/bin/templates/cordova/version
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/version b/bin/templates/cordova/version
index b437a5f..4bec3dc 100755
--- a/bin/templates/cordova/version
+++ b/bin/templates/cordova/version
@@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
-echo "3.0.0rc1"
+echo "3.0.0"
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/d0b3f419/framework/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js
index b5f0f58..869d67f 100644
--- a/framework/assets/www/cordova.js
+++ b/framework/assets/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: android
-// 3.0.0rc1-0-g1965a39
+// 3.0.0-0-ge670de9
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +19,7 @@
under the License.
*/
;(function() {
-var CORDOVA_JS_BUILD_LABEL = '3.0.0rc1-0-g1965a39';
+var CORDOVA_JS_BUILD_LABEL = '3.0.0-0-ge670de9';
// file: lib/scripts/require.js
var require,
@@ -1786,7 +1786,7 @@ function handlePluginsObject(path, moduleList) {
var scriptCounter = moduleList.length;
if (!scriptCounter) {
- onScriptLoadingComplete();
+ finishPluginLoading();
return;
}
function scriptLoadedCallback() {
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/d0b3f419/test/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/test/assets/www/cordova.js b/test/assets/www/cordova.js
index 4fc9746..869d67f 100755
--- a/test/assets/www/cordova.js
+++ b/test/assets/www/cordova.js
@@ -1,5 +1,5 @@
// Platform: android
-// 2.7.0rc1-169-g87cc336
+// 3.0.0-0-ge670de9
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +19,7 @@
under the License.
*/
;(function() {
-var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-169-g87cc336';
+var CORDOVA_JS_BUILD_LABEL = '3.0.0-0-ge670de9';
// file: lib/scripts/require.js
var require,
@@ -900,7 +900,7 @@ function androidExec(success, fail, service, action, args) {
// Process any ArrayBuffers in the args into a string.
for (var i = 0; i < args.length; i++) {
if (utils.typeName(args[i]) == 'ArrayBuffer') {
- args[i] = utils.encodeBase64(args[i]);
+ args[i] = base64.fromArrayBuffer(args[i]);
}
}
@@ -1784,6 +1784,11 @@ function finishPluginLoading() {
function handlePluginsObject(path, moduleList) {
// Now inject the scripts.
var scriptCounter = moduleList.length;
+
+ if (!scriptCounter) {
+ finishPluginLoading();
+ return;
+ }
function scriptLoadedCallback() {
if (!--scriptCounter) {
onScriptLoadingComplete(moduleList);