mirror of
https://github.com/tenrok/axios.git
synced 2026-06-20 20:00:40 +03:00
Merge pull request #182 from anthwinter/master
Only use XDomainRequest <= IE 9
This commit is contained in:
+2
-1
@@ -8,6 +8,7 @@ var buildURL = require('./../helpers/buildURL');
|
|||||||
var parseHeaders = require('./../helpers/parseHeaders');
|
var parseHeaders = require('./../helpers/parseHeaders');
|
||||||
var transformData = require('./../helpers/transformData');
|
var transformData = require('./../helpers/transformData');
|
||||||
var isURLSameOrigin = require('./../helpers/isURLSameOrigin');
|
var isURLSameOrigin = require('./../helpers/isURLSameOrigin');
|
||||||
|
var ieVersion = require('./../helpers/ieVersion');
|
||||||
var btoa = window.btoa || require('./../helpers/btoa');
|
var btoa = window.btoa || require('./../helpers/btoa');
|
||||||
|
|
||||||
module.exports = function xhrAdapter(resolve, reject, config) {
|
module.exports = function xhrAdapter(resolve, reject, config) {
|
||||||
@@ -34,7 +35,7 @@ module.exports = function xhrAdapter(resolve, reject, config) {
|
|||||||
var xDomain = false;
|
var xDomain = false;
|
||||||
|
|
||||||
// For IE 8/9 CORS support
|
// For IE 8/9 CORS support
|
||||||
if (!isURLSameOrigin(config.url) && window.XDomainRequest) {
|
if (ieVersion() <= 9 && !isURLSameOrigin(config.url) && window.XDomainRequest) {
|
||||||
Adapter = window.XDomainRequest;
|
Adapter = window.XDomainRequest;
|
||||||
loadEvent = 'onload';
|
loadEvent = 'onload';
|
||||||
xDomain = true;
|
xDomain = true;
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* https://gist.github.com/padolsey/527683
|
||||||
|
*
|
||||||
|
* A short snippet for detecting versions of IE in JavaScript
|
||||||
|
* without resorting to user-agent sniffing
|
||||||
|
*
|
||||||
|
* @returns {Number|undefined} Number of IE version (5-9), otherwise undefined
|
||||||
|
*/
|
||||||
|
module.exports = function ieVersion() {
|
||||||
|
var undef;
|
||||||
|
var v = 3;
|
||||||
|
var div = document.createElement('div');
|
||||||
|
var all = div.getElementsByTagName('i');
|
||||||
|
|
||||||
|
while ((
|
||||||
|
div.innerHTML = '<!--[if gt IE ' + (++v) + ']><i></i><![endif]-->',
|
||||||
|
all[0]
|
||||||
|
));
|
||||||
|
|
||||||
|
return v > 4 ? v : undef;
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user