diff options
| author | Michał Gołębiowski <m.goleb@gmail.com> | 2014-09-11 15:18:34 -0500 |
|---|---|---|
| committer | Michał Gołębiowski <m.goleb@gmail.com> | 2014-12-26 13:26:46 +0100 |
| commit | 76df9e4e389d80bff410a9e5f08b848de1d21a2f (patch) | |
| tree | 215a453aac2f1cc5574f66173e91d391493146d3 /src/ajax | |
| parent | ab20d9d24f0a95df382c02e9ef3dcc4adb86e4f1 (diff) | |
| download | jquery-76df9e4e389d80bff410a9e5f08b848de1d21a2f.tar.gz jquery-76df9e4e389d80bff410a9e5f08b848de1d21a2f.zip | |
Build: Don't assume the browser environment; smoke test on Node w/ jsdom
Fixes gh-1950
Closes gh-1949
Diffstat (limited to 'src/ajax')
| -rw-r--r-- | src/ajax/parseXML.js | 2 | ||||
| -rw-r--r-- | src/ajax/script.js | 3 | ||||
| -rw-r--r-- | src/ajax/var/location.js | 3 | ||||
| -rw-r--r-- | src/ajax/xhr.js | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/src/ajax/parseXML.js b/src/ajax/parseXML.js index 6a40c854a..962dc8887 100644 --- a/src/ajax/parseXML.js +++ b/src/ajax/parseXML.js @@ -11,7 +11,7 @@ jQuery.parseXML = function( data ) { // Support: IE9 try { - xml = ( new DOMParser() ).parseFromString( data, "text/xml" ); + xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" ); } catch ( e ) { xml = undefined; } diff --git a/src/ajax/script.js b/src/ajax/script.js index e5ad4d8f9..bf5f91d53 100644 --- a/src/ajax/script.js +++ b/src/ajax/script.js @@ -1,7 +1,8 @@ define([ "../core", + "../var/document", "../ajax" -], function( jQuery ) { +], function( jQuery, document ) { // Install script dataType jQuery.ajaxSetup({ diff --git a/src/ajax/var/location.js b/src/ajax/var/location.js new file mode 100644 index 000000000..4c9cf4a4c --- /dev/null +++ b/src/ajax/var/location.js @@ -0,0 +1,3 @@ +define(function() { + return window.location; +}); diff --git a/src/ajax/xhr.js b/src/ajax/xhr.js index 32afd2309..c1aceaa4a 100644 --- a/src/ajax/xhr.js +++ b/src/ajax/xhr.js @@ -6,7 +6,7 @@ define([ jQuery.ajaxSettings.xhr = function() { try { - return new XMLHttpRequest(); + return new window.XMLHttpRequest(); } catch ( e ) {} }; |