github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-01 02:12:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Pull in exec fix for Android 2.2

Browse Source
This commit is contained in:
Simon MacDonald 2012-10-24 16:29:26 -04:00
parent 652f15f893
commit 412bb349ac
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
framework/assets/js/cordova.android.js
View File

@ -1,6 +1,6 @@
// commit 98d190ad98ec48f4f06c61286faee99c0eb000ed // commit 6881d72b96f476a1e8cd6e03fe1465a0fb88b000
// File generated at :: Mon Oct 15 2012 13:22:37 GMT-0700 (PDT) // File generated at :: Wed Oct 24 2012 16:27:17 GMT-0400 (EDT)
/* /*
Licensed to the Apache Software Foundation (ASF) under one Licensed to the Apache Software Foundation (ASF) under one
@ -695,7 +695,6 @@ module.exports = {
return ( CommandProxyMap[service] ? CommandProxyMap[service][action] : null ); return ( CommandProxyMap[service] ? CommandProxyMap[service][action] : null );
} }
}; };
}); });
// file: lib/common/common.js // file: lib/common/common.js
@ -1096,6 +1095,8 @@ androidExec.processMessages = function(messages) {
window.setTimeout(pollOnce, 0); window.setTimeout(pollOnce, 0);
break; break;
} }
// Needed for Android 2.2
messages = "" + messages;
var spaceIdx = messages.indexOf(' '); var spaceIdx = messages.indexOf(' ');
var msgLen = +messages.slice(0, spaceIdx); var msgLen = +messages.slice(0, spaceIdx);
var message = messages.substr(spaceIdx + 1, msgLen); var message = messages.substr(spaceIdx + 1, msgLen);
@ -6322,8 +6323,8 @@ utils.extend = (function() {
* Alerts a message in any available way: alert or console.log. * Alerts a message in any available way: alert or console.log.
*/ */
utils.alert = function(msg) { utils.alert = function(msg) {
if (alert) { if (window.alert) {
alert(msg); window.alert(msg);
} else if (console && console.log) { } else if (console && console.log) {
console.log(msg); console.log(msg);
} }