Make sure that #... are trimmed from Ajax request URLs. Fixes #4987.

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index f797e1a..97d4039 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -1,12 +1,16 @@
-var jsc = now(),
-       rscript = /<script(.|\s)*?\/script>/gi,
-       rselectTextarea = /select|textarea/i,
-       rinput = /color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,
+(function( jQuery ) {
+
+var jsc = jQuery.now(),
+       rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+       rselectTextarea = /^(?:select|textarea)/i,
+       rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
+       rbracket = /\[\]$/,
        jsre = /\=\?(&|$)/,
        rquery = /\?/,
-       rts = /(\?|&)_=.*?(&|$)/,
+       rts = /([?&])_=[^&]*(&?)/,
        rurl = /^(\w+:)?\/\/([^\/?#]+)/,
        r20 = /%20/g,
+       rhash = /#[^#]*$/,
 
        // Keep a copy of the old load method
        _load = jQuery.fn.load;
@@ -59,7 +63,7 @@ jQuery.fn.extend({
                                        // See if a selector was specified
                                        self.html( selector ?
                                                // Create a dummy div to hold the results
-                                               jQuery("<div />")
+                                               jQuery("<div>")
                                                        // inject the contents of the document in, removing the scripts
                                                        // to avoid any 'Permission Denied' errors in IE
                                                        .append(res.responseText.replace(rscript, ""))
@@ -202,6 +206,7 @@ jQuery.extend({
                var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings),
                        jsonp, status, data, type = s.type.toUpperCase();
 
+               s.url = s.url.replace( rhash, "" );
                s.context = origSettings && origSettings.context || s;
 
                // convert data if not already a string
@@ -237,17 +242,25 @@ jQuery.extend({
                        s.dataType = "script";
 
                        // Handle JSONP-style loading
-                       window[ jsonp ] = window[ jsonp ] || function( tmp ) {
+                       var customJsonp = window[ jsonp ];
+
+                       window[ jsonp ] = function( tmp ) {
                                data = tmp;
                                jQuery.ajax.handleSuccess( s, xhr, status, data );
                                jQuery.ajax.handleComplete( s, xhr, status, data );
-                               // Garbage collect
-                               window[ jsonp ] = undefined;
+                               
+                               if ( jQuery.isFunction( customJsonp ) ) {
+                                       customJsonp( tmp );
 
-                               try {
-                                       delete window[ jsonp ];
-                               } catch( jsonpError ) {}
+                               } else {
+                                       // Garbage collect
+                                       window[ jsonp ] = undefined;
 
+                                       try {
+                                               delete window[ jsonp ];
+                                       } catch( jsonpError ) {}
+                               }
+                               
                                if ( head ) {
                                        head.removeChild( script );
                                }
@@ -259,7 +272,7 @@ jQuery.extend({
                }
 
                if ( s.cache === false && type === "GET" ) {
-                       var ts = now();
+                       var ts = jQuery.now();
 
                        // try replacing _= if it is there
                        var ret = s.url.replace(rts, "$1_=" + ts + "$2");
@@ -436,7 +449,9 @@ jQuery.extend({
                                }
 
                                // Fire the complete handlers
-                               jQuery.ajax.handleComplete( s, xhr, status, data );
+                               if ( !jsonp ) {
+                                       jQuery.ajax.handleComplete( s, xhr, status, data );
+                               }
 
                                if ( isTimeout === "timeout" ) {
                                        xhr.abort();
@@ -474,7 +489,7 @@ jQuery.extend({
 
                // Send the data
                try {
-                       xhr.send( type === "POST" || type === "PUT" || type === "DELETE" ? s.data : null );
+                       xhr.send( (type !== "GET" && s.data) || null );
 
                } catch( sendError ) {
                        jQuery.ajax.handleError( s, xhr, null, e );
@@ -530,7 +545,7 @@ function buildParams( prefix, obj, traditional, add ) {
        if ( jQuery.isArray(obj) ) {
                // Serialize array item.
                jQuery.each( obj, function( i, v ) {
-                       if ( traditional || /\[\]$/.test( prefix ) ) {
+                       if ( traditional || rbracket.test( prefix ) ) {
                                // Treat each array item as a scalar.
                                add( prefix, v );
 
@@ -617,9 +632,8 @@ jQuery.extend( jQuery.ajax, {
                try {
                        // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
                        return !xhr.status && location.protocol === "file:" ||
-                               // Opera returns 0 when status is 304
-                               ( xhr.status >= 200 && xhr.status < 300 ) ||
-                               xhr.status === 304 || xhr.status === 1223 || xhr.status === 0;
+                               xhr.status >= 200 && xhr.status < 300 ||
+                               xhr.status === 304 || xhr.status === 1223;
                } catch(e) {}
 
                return false;
@@ -638,8 +652,7 @@ jQuery.extend( jQuery.ajax, {
                        jQuery.ajax.etag[url] = etag;
                }
 
-               // Opera returns 0 when status is 304
-               return xhr.status === 304 || xhr.status === 0;
+               return xhr.status === 304;
        },
 
        httpData: function( xhr, type, s ) {
@@ -674,5 +687,10 @@ jQuery.extend( jQuery.ajax, {
 
 });
 
+// Does this browser support XHR requests?
+jQuery.support.ajax = !!jQuery.ajaxSettings.xhr();
+
 // For backwards compatibility
 jQuery.extend( jQuery.ajax );
+
+})( jQuery );