incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From macdo...@apache.org
Subject [2/3] android commit: Pull in exec fix for Android 2.2
Date Wed, 24 Oct 2012 20:32:17 GMT
Pull in exec fix for Android 2.2


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/commit/412bb349
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/412bb349
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/412bb349

Branch: refs/heads/master
Commit: 412bb349acab4ba8a97be2fcf048de9e7e831d93
Parents: 652f15f
Author: Simon MacDonald <simon.macdonald@gmail.com>
Authored: Wed Oct 24 16:29:26 2012 -0400
Committer: Simon MacDonald <simon.macdonald@gmail.com>
Committed: Wed Oct 24 16:29:26 2012 -0400

----------------------------------------------------------------------
 framework/assets/js/cordova.android.js |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/412bb349/framework/assets/js/cordova.android.js
----------------------------------------------------------------------
diff --git a/framework/assets/js/cordova.android.js b/framework/assets/js/cordova.android.js
index e786749..693baa4 100644
--- a/framework/assets/js/cordova.android.js
+++ b/framework/assets/js/cordova.android.js
@@ -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
@@ -695,7 +695,6 @@ module.exports = {
         return ( CommandProxyMap[service] ? CommandProxyMap[service][action] : null );
     }
 };
-
 });
 
 // file: lib/common/common.js
@@ -1096,6 +1095,8 @@ androidExec.processMessages = function(messages) {
                 window.setTimeout(pollOnce, 0);
                 break;
             }
+            // Needed for Android 2.2
+            messages = "" + messages;
             var spaceIdx = messages.indexOf(' ');
             var msgLen = +messages.slice(0, spaceIdx);
             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.
  */
 utils.alert = function(msg) {
-    if (alert) {
-        alert(msg);
+    if (window.alert) {
+        window.alert(msg);
     } else if (console && console.log) {
         console.log(msg);
     }


Mime
View raw message