cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject [2/2] js commit: Upleveled changes from android.
Date Tue, 06 May 2014 22:44:47 GMT
Upleveled changes from android.


Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/c5ec79c8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/c5ec79c8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/c5ec79c8

Branch: refs/heads/3.5.x
Commit: c5ec79c8b2b9db0251cbf3097feacf12c5f3d94a
Parents: 4318b7d
Author: Archana Naik <naika@lab126.com>
Authored: Mon May 5 14:00:52 2014 -0700
Committer: Archana Naik <naika@lab126.com>
Committed: Tue May 6 15:44:21 2014 -0700

----------------------------------------------------------------------
 src/amazon-fireos/exec.js     | 6 +++---
 src/amazon-fireos/platform.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c5ec79c8/src/amazon-fireos/exec.js
----------------------------------------------------------------------
diff --git a/src/amazon-fireos/exec.js b/src/amazon-fireos/exec.js
index 4a81630..7eca8c6 100644
--- a/src/amazon-fireos/exec.js
+++ b/src/amazon-fireos/exec.js
@@ -98,7 +98,7 @@ function androidExec(success, fail, service, action, args) {
             androidExec.setJsToNativeBridgeMode(jsToNativeModes.JS_OBJECT);
             return;
         } else {
-            androidExec.processMessages(messages);
+            androidExec.processMessages(messages, true);
         }
     }
 }
@@ -206,12 +206,12 @@ function processMessage(message) {
             }
             cordova.callbackFromNative(callbackId, success, status, [payload], keepCallback);
         } else {
-            console.log("processMessage failed: invalid message:" + message);
+            console.log("processMessage failed: invalid message: " + JSON.stringify(message));
         }
     } catch (e) {
-        console.log("processMessage failed: Message: " + message);
         console.log("processMessage failed: Error: " + e);
         console.log("processMessage failed: Stack: " + e.stack);
+        console.log("processMessage failed: Message: " + message);
     }
 }
 

http://git-wip-us.apache.org/repos/asf/cordova-js/blob/c5ec79c8/src/amazon-fireos/platform.js
----------------------------------------------------------------------
diff --git a/src/amazon-fireos/platform.js b/src/amazon-fireos/platform.js
index 768b39b..bf966c0 100644
--- a/src/amazon-fireos/platform.js
+++ b/src/amazon-fireos/platform.js
@@ -20,7 +20,7 @@
 */
 
 module.exports = {
-    id: 'amazon-fireos',
+    id: 'android',
     bootstrap: function() {
         var channel = require('cordova/channel'),
             cordova = require('cordova'),


Mime
View raw message