cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject ios commit: CB-8838 - Moved commandQueue push into non-WK_WEBVIEW_BINDING branch. (closes #136)
Date Mon, 20 Apr 2015 23:46:21 GMT
Repository: cordova-ios
Updated Branches:
  refs/heads/4.0.x e655e3084 -> 183e3b8a2


CB-8838 - Moved commandQueue push into non-WK_WEBVIEW_BINDING branch. (closes #136)


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

Branch: refs/heads/4.0.x
Commit: 183e3b8a231b3a39d17b97f34df9884fef05d72b
Parents: e655e30
Author: Alex Mouton <thomas.mouton@gmail.com>
Authored: Thu Apr 9 15:16:40 2015 -0700
Committer: Shazron Abdullah <shazron@apache.org>
Committed: Mon Apr 20 16:45:35 2015 -0700

----------------------------------------------------------------------
 CordovaLib/cordova.js  | 10 +++++-----
 cordova-js-src/exec.js | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/183e3b8a/CordovaLib/cordova.js
----------------------------------------------------------------------
diff --git a/CordovaLib/cordova.js b/CordovaLib/cordova.js
index 35dbc89..90e10a9 100644
--- a/CordovaLib/cordova.js
+++ b/CordovaLib/cordova.js
@@ -970,14 +970,14 @@ function iOSExec() {
 
     var command = [callbackId, service, action, actionArgs];
 
-    // Stringify and queue the command. We stringify to command now to
-    // effectively clone the command arguments in case they are mutated before
-    // the command is executed.
-    commandQueue.push(JSON.stringify(command));
-    
     if (bridgeMode === jsToNativeModes.WK_WEBVIEW_BINDING) {
         window.webkit.messageHandlers.cordova.postMessage(command);
     } else {
+        // Stringify and queue the command. We stringify to command now to
+        // effectively clone the command arguments in case they are mutated before
+        // the command is executed.
+        commandQueue.push(JSON.stringify(command));
+
         // If we're in the context of a stringByEvaluatingJavaScriptFromString call,
         // then the queue will be flushed when it returns; no need for a poke.
         // Also, if there is already a command in the queue, then we've already

http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/183e3b8a/cordova-js-src/exec.js
----------------------------------------------------------------------
diff --git a/cordova-js-src/exec.js b/cordova-js-src/exec.js
index 32a3f8b..856b9b1 100644
--- a/cordova-js-src/exec.js
+++ b/cordova-js-src/exec.js
@@ -171,14 +171,14 @@ function iOSExec() {
 
     var command = [callbackId, service, action, actionArgs];
 
-    // Stringify and queue the command. We stringify to command now to
-    // effectively clone the command arguments in case they are mutated before
-    // the command is executed.
-    commandQueue.push(JSON.stringify(command));
-    
     if (bridgeMode === jsToNativeModes.WK_WEBVIEW_BINDING) {
         window.webkit.messageHandlers.cordova.postMessage(command);
     } else {
+        // Stringify and queue the command. We stringify to command now to
+        // effectively clone the command arguments in case they are mutated before
+        // the command is executed.
+        commandQueue.push(JSON.stringify(command));
+    
         // If we're in the context of a stringByEvaluatingJavaScriptFromString call,
         // then the queue will be flushed when it returns; no need for a poke.
         // Also, if there is already a command in the queue, then we've already


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message