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 2015/03/07 01:18:32 UTC
[19/43] ios commit: Merge branch 'wkwebview' of
https://git-wip-us.apache.org/repos/asf/cordova-ios into wkwebview
Merge branch 'wkwebview' of https://git-wip-us.apache.org/repos/asf/cordova-ios into wkwebview
Conflicts:
CordovaLib/Classes/CDVCommandDelegateImpl.m
CordovaLib/Classes/CDVViewController.m
CordovaLib/CordovaLib.xcodeproj/project.pbxproj
CordovaLib/cordova.js
bin/templates/project/__PROJECT_NAME__/Classes/AppDelegate.m
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/f13ba3a4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/f13ba3a4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/f13ba3a4
Branch: refs/heads/4.0.x
Commit: f13ba3a49405db39cb2856fe10804eee8b6a835e
Parents: 1a7dbfa 2a38ad2
Author: Shazron Abdullah <sh...@apache.org>
Authored: Fri Oct 31 16:39:10 2014 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Fri Oct 31 16:39:10 2014 -0700
----------------------------------------------------------------------
CordovaLib/cordova.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/f13ba3a4/CordovaLib/cordova.js
----------------------------------------------------------------------
diff --cc CordovaLib/cordova.js
index 36dfa1b,2470044..41db627
--- a/CordovaLib/cordova.js
+++ b/CordovaLib/cordova.js
@@@ -928,10 -925,10 +928,10 @@@ function iOSExec()
if (navigator.userAgent) {
bridgeMode = navigator.userAgent.indexOf(' 5_') == -1 ? jsToNativeModes.IFRAME_NAV: jsToNativeModes.XHR_NO_PAYLOAD;
} else {
- bridgeMode = jsToNativeModes.IFRAME_NAV;
+ bridgeMode = jsToNativeModes.IFRAME_NAV;
}
}
-
+
if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.cordova && window.webkit.messageHandlers.cordova.postMessage) {
bridgeMode = jsToNativeModes.WK_WEBVIEW_BINDING;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org