You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2014/06/05 23:28:26 UTC
[1/2] js commit: CB-6863 - Default Cordova bridge broken due to
replacing window.navigator (iOS 8)
Repository: cordova-js
Updated Branches:
refs/heads/master bf2d55eb4 -> cf51b9171
CB-6863 - Default Cordova bridge broken due to replacing window.navigator (iOS 8)
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/2ae3caa1
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/2ae3caa1
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/2ae3caa1
Branch: refs/heads/master
Commit: 2ae3caa1c81c894d9544f71d9e09d0573090c90e
Parents: d970db7
Author: Shazron Abdullah <sh...@apache.org>
Authored: Thu Jun 5 14:27:10 2014 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Thu Jun 5 14:27:10 2014 -0700
----------------------------------------------------------------------
src/ios/exec.js | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/2ae3caa1/src/ios/exec.js
----------------------------------------------------------------------
diff --git a/src/ios/exec.js b/src/ios/exec.js
index 4855d5c..4206e4b 100644
--- a/src/ios/exec.js
+++ b/src/ios/exec.js
@@ -134,9 +134,13 @@ function iOSExec() {
// Use IFRAME_NAV elsewhere since it's faster and XHR bridge
// seems to have bugs in newer OS's (CB-3900, CB-3359, CB-5457, CB-4970, CB-4998, CB-5134)
if (bridgeMode === undefined) {
- bridgeMode = navigator.userAgent.indexOf(' 5_') == -1 ? jsToNativeModes.IFRAME_NAV: jsToNativeModes.XHR_NO_PAYLOAD;
+ if (navigator.userAgent) {
+ bridgeMode = navigator.userAgent.indexOf(' 5_') == -1 ? jsToNativeModes.IFRAME_NAV: jsToNativeModes.XHR_NO_PAYLOAD;
+ } else {
+ bridgeMode = jsToNativeModes.IFRAME_NAV;
+ }
}
-
+
var successCallback, failCallback, service, action, actionArgs, splitCommand;
var callbackId = null;
if (typeof arguments[0] !== "string") {
[2/2] js commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/cordova-js
Posted by sh...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-js
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/cf51b917
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/cf51b917
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/cf51b917
Branch: refs/heads/master
Commit: cf51b917159883909c7a8c10b76994013003261d
Parents: 2ae3caa bf2d55e
Author: Shazron Abdullah <sh...@apache.org>
Authored: Thu Jun 5 14:27:33 2014 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Thu Jun 5 14:27:33 2014 -0700
----------------------------------------------------------------------
src/cordova_b.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------