Merge pull request axios#85 from tomaash/patch-1

mzabriskie · mzabriskie · commit 63ac064c8894 · 2015-07-23T09:07:24.000-07:00
In browsers check for XMLHttpRequest, not window
diff --git a/lib/core/dispatchRequest.js b/lib/core/dispatchRequest.js
@@ -11,7 +11,7 @@ module.exports = function dispatchRequest(config) {
   return new Promise(function (resolve, reject) {
     try {
       // For browsers use XHR adapter
-      if (typeof window !== 'undefined') {
+      if ((typeof XMLHttpRequest !== 'undefined') || (typeof ActiveXObject !== 'undefined')) {
         require('../adapters/xhr')(resolve, reject, config);
       }
       // For node use HTTP adapter

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ module.exports = function dispatchRequest(config) {`
`11`	`11`	`return new Promise(function (resolve, reject) {`
`12`	`12`	`try {`
`13`	`13`	`// For browsers use XHR adapter`
`14`		`- if (typeof window !== 'undefined') {`
	`14`	`+ if ((typeof XMLHttpRequest !== 'undefined') \|\| (typeof ActiveXObject !== 'undefined')) {`
`15`	`15`	`require('../adapters/xhr')(resolve, reject, config);`
`16`	`16`	`}`
`17`	`17`	`// For node use HTTP adapter`