From 57f56be04f18f25fbf313973c1d8ce685fa05d3e Mon Sep 17 00:00:00 2001 From: rwldrn Date: Thu, 28 Apr 2011 14:11:34 -0400 Subject: [PATCH] Make cached rspaces regex definitions consistent. Fixes #9008 --- src/ajax.js | 6 +++--- src/event.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ajax.js b/src/ajax.js index a16717b0..2d048479 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -13,7 +13,7 @@ var r20 = /%20/g, rquery = /\?/, rscript = /)<[^<]*)*<\/script>/gi, rselectTextarea = /^(?:select|textarea)/i, - rspacesAjax = /\s+/, + rspaces = /\s+/, rts = /([?&])_=[^&]*/, rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/, @@ -71,7 +71,7 @@ function addToPrefiltersOrTransports( structure ) { } if ( jQuery.isFunction( func ) ) { - var dataTypes = dataTypeExpression.toLowerCase().split( rspacesAjax ), + var dataTypes = dataTypeExpression.toLowerCase().split( rspaces ), i = 0, length = dataTypes.length, dataType, @@ -599,7 +599,7 @@ jQuery.extend({ s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" ); // Extract dataTypes list - s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax ); + s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspaces ); // Determine if a cross-domain request is in order if ( s.crossDomain == null ) { diff --git a/src/event.js b/src/event.js index 0f09241c..09ea02e7 100644 --- a/src/event.js +++ b/src/event.js @@ -4,7 +4,7 @@ var hasOwn = Object.prototype.hasOwnProperty, rnamespaces = /\.(.*)$/, rformElems = /^(?:textarea|input|select)$/i, rperiod = /\./g, - rspace = / /g, + rspaces = /\s+/, rescape = /[^\w\s.|`]/g, fcleanup = function( nm ) { return nm.replace(rescape, "\\$&"); @@ -1177,7 +1177,7 @@ function liveHandler( event ) { } function liveConvert( type, selector ) { - return (type && type !== "*" ? type + "." : "") + selector.replace(rperiod, "`").replace(rspace, "&"); + return (type && type !== "*" ? type + "." : "") + selector.replace(rperiod, "`").replace(rspaces, "&"); } jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +