From 01c97b73dfabb2d5019453221cb7ec6aadf823d9 Mon Sep 17 00:00:00 2001 From: Sebastian Tschan Date: Thu, 9 Feb 2012 10:42:17 +0900 Subject: [PATCH] Only make XDomainRequest Transport available if cross-domain XHR requests are not available. --- js/cors/jquery.xdr-transport.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/js/cors/jquery.xdr-transport.js b/js/cors/jquery.xdr-transport.js index 8f37fefb6..ad41fa838 100644 --- a/js/cors/jquery.xdr-transport.js +++ b/js/cors/jquery.xdr-transport.js @@ -1,5 +1,5 @@ /* - * jQuery XDomainRequest Transport Plugin 1.1 + * jQuery XDomainRequest Transport Plugin 1.1.1 * https://github.com/blueimp/jQuery-File-Upload * * Copyright 2011, Sebastian Tschan @@ -13,7 +13,7 @@ */ /*jslint unparam: true */ -/*global define, window, XDomainRequest */ +/*global define, window, XDomainRequest, XMLHttpRequest */ (function (factory) { 'use strict'; @@ -26,7 +26,8 @@ } }(function ($) { 'use strict'; - if (window.XDomainRequest) { + if (window.XDomainRequest && (!window.XMLHttpRequest || + (new XMLHttpRequest()).withCredentials === undefined)) { $.ajaxTransport(function (s) { if (s.crossDomain && s.async) { if (s.timeout) {