Skip to content
Permalink
Browse files

Merged pull request #361 from rwldrn/9008a.

Restored /g flag to rspaces; Adds unit tests; Supplements #9008
  • Loading branch information...
dmethvin committed Apr 29, 2011
2 parents e5f4ec8 + bf678fd commit e2bace8fa129c2bf3fe5bd382a4b05d96e8cf245
Showing with 24 additions and 8 deletions.
  1. +3 −3 src/ajax.js
  2. +4 −4 src/attributes.js
  3. +1 −1 src/event.js
  4. +16 −0 test/unit/event.js
@@ -13,7 +13,7 @@ var r20 = /%20/g,
rquery = /\?/,
rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
rselectTextarea = /^(?:select|textarea)/i,
rspaces = /\s+/,
rspacesAjax = /\s+/,
rts = /([?&])_=[^&]*/,
rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,

@@ -71,7 +71,7 @@ function addToPrefiltersOrTransports( structure ) {
}

if ( jQuery.isFunction( func ) ) {
var dataTypes = dataTypeExpression.toLowerCase().split( rspaces ),
var dataTypes = dataTypeExpression.toLowerCase().split( rspacesAjax ),
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( rspaces );
s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );

// Determine if a cross-domain request is in order
if ( s.crossDomain == null ) {
@@ -1,7 +1,7 @@
(function( jQuery ) {

var rclass = /[\n\t\r]/g,
rspaces = /\s+/,
rspace = /\s+/,
rreturn = /\r/g,
rtype = /^(?:button|input)$/i,
rfocusable = /^(?:button|input|object|select|textarea)$/i,
@@ -43,7 +43,7 @@ jQuery.fn.extend({
}

if ( value && typeof value === "string" ) {
var classNames = (value || "").split( rspaces );
var classNames = (value || "").split( rspace );

for ( var i = 0, l = this.length; i < l; i++ ) {
var elem = this[i];
@@ -79,7 +79,7 @@ jQuery.fn.extend({
}

if ( (value && typeof value === "string") || value === undefined ) {
var classNames = (value || "").split( rspaces );
var classNames = (value || "").split( rspace );

for ( var i = 0, l = this.length; i < l; i++ ) {
var elem = this[i];
@@ -120,7 +120,7 @@ jQuery.fn.extend({
i = 0,
self = jQuery( this ),
state = stateVal,
classNames = value.split( rspaces );
classNames = value.split( rspace );

while ( (className = classNames[ i++ ]) ) {
// check each className given, space seperated list
@@ -4,7 +4,7 @@ var hasOwn = Object.prototype.hasOwnProperty,
rnamespaces = /\.(.*)$/,
rformElems = /^(?:textarea|input|select)$/i,
rperiod = /\./g,
rspaces = /\s+/,
rspaces = / /g,
rescape = /[^\w\s.|`]/g,
fcleanup = function( nm ) {
return nm.replace(rescape, "\\$&");
@@ -68,6 +68,22 @@ test("bind(), multiple events at once", function() {
equals( mouseoverCounter, 1, "bind() with multiple events at once" );
});

test("bind(), five events at once", function() {
expect(1);

var count = 0,
handler = function(event) {
count++;
};

jQuery("#firstp").bind("click mouseover foo bar baz", handler)
.trigger("click").trigger("mouseover")
.trigger("foo").trigger("bar")
.trigger("baz");

equals( count, 5, "bind() five events at once" );
});

test("bind(), multiple events at once and namespaces", function() {
expect(7);

0 comments on commit e2bace8

Please sign in to comment.
You can’t perform that action at this time.