Closes #2688

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index bf2744b..77537e7 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -232,7 +232,7 @@ jQuery.extend({
 
                // If we're requesting a remote document
                // and trying to load JSON or Script with a GET
-               if ( (!s.url.indexOf("http") || !s.url.indexOf("//")) && ( s.dataType == "script" || s.dataType =="json" ) && s.type.toLowerCase() == "get" ) {
+               if ( (!s.url.indexOf("http") || !s.url.indexOf("//")) && s.dataType == "script" && s.type.toLowerCase() == "get" ) {
                        var head = document.getElementsByTagName("head")[0];
                        var script = document.createElement("script");
                        script.src = s.url;
@@ -287,13 +287,16 @@ jQuery.extend({
                        // Set the Accepts header for the server, depending on the dataType
                        xml.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
                                s.accepts[ s.dataType ] + ", */*" :
-                               s.accepts.default );
+                               s.accepts._default );
                } catch(e){}
 
                // Allow custom headers/mimetypes
                if ( s.beforeSend )
-                       s.beforeSend(xml);
+                       var beforeSendSuccess = s.beforeSend(xml, s);
                        
+               if( beforeSendSuccess === false )
+                 return false;
+               
                if ( s.global )
                        jQuery.event.trigger("ajaxSend", [xml, s]);