Return-Path: X-Original-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-callback-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A9D65DB3E for ; Thu, 4 Oct 2012 15:24:02 +0000 (UTC) Received: (qmail 78113 invoked by uid 500); 4 Oct 2012 15:24:02 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 78059 invoked by uid 500); 4 Oct 2012 15:24:02 -0000 Mailing-List: contact callback-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@incubator.apache.org Delivered-To: mailing list callback-commits@incubator.apache.org Received: (qmail 78001 invoked by uid 99); 4 Oct 2012 15:24:01 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Oct 2012 15:24:01 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A6C6C3A14F; Thu, 4 Oct 2012 15:24:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gtanner@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/6] js commit: Merge branch 'master' of https://github.com/apache/incubator-cordova-js Message-Id: <20121004152401.A6C6C3A14F@tyr.zones.apache.org> Date: Thu, 4 Oct 2012 15:24:01 +0000 (UTC) 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 Authored: Thu Oct 4 11:22:11 2012 -0400 Committer: Gord Tanner 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");