X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=eb81e4c484732154bac949a6225c4abbe5303dbb;hb=c6e88b16e9f6e45d87019db45dd04d27482d25d7;hp=a0c80afe6c03571e2cc7df6c3adaba02da929412;hpb=afc2ebde1425722f4e2df14919c0df0ff7d2ff0c;p=jquery.git diff --git a/src/ajax.js b/src/ajax.js index a0c80af..eb81e4c 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -26,7 +26,7 @@ jQuery.fn.extend({ params = null; // Otherwise, build a param string - } else { + } else if( typeof params == 'object' ) { params = jQuery.param( params ); type = "POST"; } @@ -327,9 +327,9 @@ jQuery.extend({ ival = null; } - status = isTimeout == "timeout" && "timeout" || - !jQuery.httpSuccess( xhr ) && "error" || - s.ifModified && jQuery.httpNotModified( xhr, s.url ) && "notmodified" || + status = isTimeout == "timeout" ? "timeout" : + !jQuery.httpSuccess( xhr ) ? "error" : + s.ifModified && jQuery.httpNotModified( xhr, s.url ) ? "notmodified" : "success"; if ( status == "success" ) {