Applied the RegExp issues reported by Jeff Robinson here: http://jmrware.com/articles...

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index 2c4f13c..cc87133 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -1,10 +1,13 @@
+(function( jQuery ) {
+
 var jsc = jQuery.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,
+       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,
 
@@ -59,7 +62,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, ""))
@@ -540,7 +543,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 );
 
@@ -627,9 +630,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;
@@ -648,8 +650,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 ) {
@@ -684,5 +685,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 );