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/10/14 00:21:02 UTC
js commit: CB-2520 - User agent-related changes for custom user
agents in iOS
Repository: cordova-js
Updated Branches:
refs/heads/master 1b9dc0da8 -> d9e2a1c24
CB-2520 - User agent-related changes for custom user agents in iOS
Signed-off-by: Shazron Abdullah <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cordova-js/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-js/commit/d9e2a1c2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-js/tree/d9e2a1c2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-js/diff/d9e2a1c2
Branch: refs/heads/master
Commit: d9e2a1c2401b986b5af09ecd6b4be60df2cbf131
Parents: 1b9dc0d
Author: Kevin Hawkins <kh...@salesforce.com>
Authored: Tue Oct 7 14:09:32 2014 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Mon Oct 13 15:17:34 2014 -0700
----------------------------------------------------------------------
src/ios/exec.js | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-js/blob/d9e2a1c2/src/ios/exec.js
----------------------------------------------------------------------
diff --git a/src/ios/exec.js b/src/ios/exec.js
index 89c2f35..e3e8b32 100644
--- a/src/ios/exec.js
+++ b/src/ios/exec.js
@@ -131,15 +131,8 @@ function convertMessageToArgsNativeToJs(message) {
}
function iOSExec() {
- // Use XHR for iOS 5 to work around a bug in -webkit-scroll.
- // 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) {
- 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) {
@@ -230,7 +223,7 @@ function pokeNativeViaXhr() {
// Add a timestamp to the query param to prevent caching.
execXhr.open('HEAD', "/!gap_exec?" + (+new Date()), true);
if (!vcHeaderValue) {
- vcHeaderValue = /.*\((.*)\)/.exec(navigator.userAgent)[1];
+ vcHeaderValue = /.*\((.*)\)$/.exec(navigator.userAgent)[1];
}
execXhr.setRequestHeader('vc', vcHeaderValue);
execXhr.setRequestHeader('rc', ++requestCount);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org