public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

Incrementing version to 3.0.0, ready for tagging

Browse Source
This commit is contained in:
Joe Bowser 2013-07-18 17:25:18 -07:00
parent d91ac45d88
commit d0b3f419ef
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
3.0.0rc1
3.0.0

2
bin/templates/cordova/version
View File

@ -16,4 +16,4 @@
# specific language governing permissions and limitations
# under the License.
echo "3.0.0rc1"
echo "3.0.0"

6
framework/assets/www/cordova.js vendored
View File

@ -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() {

11
test/assets/www/cordova.js vendored
View File

@ -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);