Skip to content
Browse files

Fix wrong query string addition logic. Patch provided by Lukas Fryc

  • Loading branch information...
1 parent cfceb30 commit 439beed40f6877edfc98ea60b70c8d76f7179a74 @jfarcand jfarcand committed Mar 30, 2012
Showing with 3 additions and 1 deletion.
  1. +3 −1 modules/jquery/src/main/webapp/jquery/jquery.atmosphere.js
View
4 modules/jquery/src/main/webapp/jquery/jquery.atmosphere.js
@@ -560,7 +560,8 @@ jQuery.atmosphere = function() {
return url;
}
- url += "?X-Atmosphere-tracking-id=" + _uuid;
+ url += (url.indexOf('?') != -1) ? '&' : '?';
+ url += "X-Atmosphere-tracking-id=" + _uuid;
url += "&X-Atmosphere-Framework=" + jQuery.atmosphere.version;
url += "&X-Atmosphere-Transport=" + rq.transport;
@@ -1483,6 +1484,7 @@ jQuery.atmosphere = function() {
} else if (jQuery.browser.opera) {
return true;
}
+
// Force Android to use CORS as some version like 2.2.3 fail otherwise
var ua = navigator.userAgent.toLowerCase();
var isAndroid = ua.indexOf("android") > -1;

0 comments on commit 439beed

Please sign in to comment.
Something went wrong with that request. Please try again.