X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=77537e7060ab4f291202ee8662473adbbbdf654c;hb=9de35ce3e73c63c791472ac773afa141a8c4ae7b;hp=0f799fcc8d230e44fbb01780f7c2442a9c592809;hpb=ff08982508cb089d0b728cb797c76cc2fe76a702;p=jquery.git diff --git a/src/ajax.js b/src/ajax.js index 0f799fc..77537e7 100644 --- 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; @@ -292,8 +292,11 @@ jQuery.extend({ // 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]);