cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtan...@apache.org
Subject [2/6] js commit: Merge branch 'master' of https://github.com/apache/incubator-cordova-js
Date Thu, 04 Oct 2012 15:24:01 GMT
Merge branch 'master' of https://github.com/apache/incubator-cordova-js


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

Branch: refs/heads/master
Commit: d51bc8b2d6f39ef0539be8390659d7c267789796
Parents: c7edd61 47fce02
Author: Gord Tanner <gtanner@gmail.com>
Authored: Thu Oct 4 11:22:11 2012 -0400
Committer: Gord Tanner <gtanner@gmail.com>
Committed: Thu Oct 4 11:22:11 2012 -0400

----------------------------------------------------------------------
 lib/android/exec.js |    6 +++---
 lib/ios/exec.js     |   18 ++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/d51bc8b2/lib/ios/exec.js
----------------------------------------------------------------------
diff --cc lib/ios/exec.js
index 546fb2c,b58df58..45cf2d6
--- a/lib/ios/exec.js
+++ b/lib/ios/exec.js
@@@ -36,11 -36,12 +36,12 @@@ var cordova = require('cordova')
          XHR_OPTIONAL_PAYLOAD: 3
      },
      // XHR mode does not work on iOS 4.2, so default to IFRAME_NAV for such devices.
 -    // XHR mode's main advantage is working around a bug in -webkit-scroll, which 
 +    // XHR mode's main advantage is working around a bug in -webkit-scroll, which
      // doesn't exist in 4.X devices anyways.
-     bridgeMode = navigator.userAgent.indexOf(' 4_') == -1 ? jsToNativeModes.XHR_OPTIONAL_PAYLOAD
: jsToNativeModes.IFRAME_NAV,
+     bridgeMode = navigator.userAgent.indexOf(' 4_') == -1 ? jsToNativeModes.XHR_NO_PAYLOAD
: jsToNativeModes.IFRAME_NAV,
      execIframe,
-     execXhr;
+     execXhr,
+     requestCount = 0;
  
  function createExecIframe() {
      var iframe = document.createElement("iframe");


Mime
View raw message