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 2C653D74D for ; Tue, 2 Oct 2012 19:51:48 +0000 (UTC) Received: (qmail 78083 invoked by uid 500); 2 Oct 2012 19:51:48 -0000 Delivered-To: apmail-incubator-callback-commits-archive@incubator.apache.org Received: (qmail 78058 invoked by uid 500); 2 Oct 2012 19:51:48 -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 78039 invoked by uid 99); 2 Oct 2012 19:51:48 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Oct 2012 19:51:48 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C61CE37324; Tue, 2 Oct 2012 19:51:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agrieve@apache.org To: callback-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/2] js commit: [ios] Change default bridge mode back to XHR_NO_PAYLOAD. Message-Id: <20121002195147.C61CE37324@tyr.zones.apache.org> Date: Tue, 2 Oct 2012 19:51:47 +0000 (UTC) Updated Branches: refs/heads/master e799aef6a -> 27d9aedd5 [ios] Change default bridge mode back to XHR_NO_PAYLOAD. Discovered that the recent change to returning YES in CDVURLProtocol causes bundled messages to be received multiple times. 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/27d9aedd Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/27d9aedd Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/27d9aedd Branch: refs/heads/master Commit: 27d9aedd5bf520f305e20fcf350da2eef244d53d Parents: c51b7f8 Author: Andrew Grieve Authored: Tue Oct 2 15:50:40 2012 -0400 Committer: Andrew Grieve Committed: Tue Oct 2 15:50:40 2012 -0400 ---------------------------------------------------------------------- lib/ios/exec.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/blob/27d9aedd/lib/ios/exec.js ---------------------------------------------------------------------- diff --git a/lib/ios/exec.js b/lib/ios/exec.js index acd5873..6635c0b 100644 --- a/lib/ios/exec.js +++ b/lib/ios/exec.js @@ -38,7 +38,7 @@ var cordova = require('cordova'), // 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 // 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;