Added in support for content-type sniffing for scripts. Fixes #5718.

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index 182a88e..9501e8a 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -179,9 +179,14 @@ jQuery.extend({
                // so we use the ActiveXObject when it is available
                // This function can be overriden by calling jQuery.ajaxSetup
                xhr: function() {
-                       return window.XMLHttpRequest && window.location.protocol !== "file:" || window.ActiveXObject ?
-                               new window.XMLHttpRequest() :
-                               new window.ActiveXObject("Microsoft.XMLHTTP");
+                       if ( window.XMLHttpRequest && (window.location.protocol !== "file:" || !window.ActiveXObject) ) {
+                               return new window.XMLHttpRequest();
+
+                       } else {
+                               try {
+                                       return new window.ActiveXObject("Microsoft.XMLHTTP");
+                               } catch(e) {}
+                       }
                },
                accepts: {
                        xml: "application/xml, text/xml",
@@ -326,6 +331,10 @@ jQuery.extend({
                // Create the request object
                var xhr = s.xhr();
 
+               if ( !xhr ) {
+                       return;
+               }
+
                // Open the socket
                // Passing null username, generates a login popup on Opera (#2865)
                if ( s.username ) {
@@ -546,8 +555,8 @@ jQuery.extend({
        },
 
        httpData: function( xhr, type, s ) {
-               var ct = xhr.getResponseHeader("content-type"),
-                       xml = type === "xml" || !type && ct && ct.indexOf("xml") >= 0,
+               var ct = xhr.getResponseHeader("content-type") || "",
+                       xml = type === "xml" || !type && ct.indexOf("xml") >= 0,
                        data = xml ? xhr.responseXML : xhr.responseText;
 
                if ( xml && data.documentElement.nodeName === "parsererror" ) {
@@ -562,17 +571,18 @@ jQuery.extend({
 
                // The filter can actually parse the response
                if ( typeof data === "string" ) {
-
                        // If the type is "script", eval it in global context
-                       if ( type === "script" ) {
+                       if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
                                jQuery.globalEval( data );
                        }
 
                        // Get the JavaScript object, if JSON is used.
-                       if ( type === "json" ) {
-                               if ( typeof JSON === "object" && JSON.parse ) {
+                       if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
+                               // Try to use the native JSON parser first
+                               try {
                                        data = JSON.parse( data );
-                               } else {
+
+                               } catch(e) {
                                        data = (new Function("return " + data))();
                                }
                        }