Permalink
Browse files

Attributes: Use simpler boolean check vs a function call

  • Loading branch information...
dmethvin authored and timmywil committed Oct 14, 2015
1 parent 53f798c commit 4bf1a09522955eb52de1fafb4ee1ecc5982b7a3e
Showing with 7 additions and 6 deletions.
  1. +2 −5 src/attributes/classes.js
  2. +5 −1 test/unit/attributes.js
@@ -100,10 +100,7 @@ jQuery.fn.extend( {
toggleClass: function( value, stateVal ) {
var type = typeof value,
- classNames = type === "string" ? value.match( rnotwhite ) : "",
- checker = typeof stateVal === "boolean" ?
- function() { return !stateVal; } :
- jQuery.fn.hasClass;
+ classNames = type === "string" ? value.match( rnotwhite ) : [];
return this.each( function( i ) {
var className,
@@ -118,7 +115,7 @@ jQuery.fn.extend( {
// Toggle individual class names based on presence or stateVal
while ( ( className = classNames[ c++ ] ) ) {
- if ( checker.call( self, className ) ) {
+ if ( stateVal === false || stateVal !== true && self.hasClass( className ) ) {
self.removeClass( className );
} else {
self.addClass( className );
View
@@ -1221,7 +1221,7 @@ QUnit.test( "removeClass(undefined) is a no-op", function( assert ) {
} );
var testToggleClass = function( valueObj, assert ) {
- assert.expect( 9 );
+ assert.expect( 11 );
var e = jQuery( "#firstp" );
assert.ok( !e.is( ".test" ), "Assert class not present" );
@@ -1233,8 +1233,12 @@ var testToggleClass = function( valueObj, assert ) {
// class name with a boolean
e.toggleClass( valueObj( "test" ), false );
assert.ok( !e.is( ".test" ), "Assert class not present" );
+ e.toggleClass( valueObj( "test" ), false );
+ assert.ok( !e.is( ".test" ), "Assert class still not present" );
e.toggleClass( valueObj( "test" ), true );
assert.ok( e.is( ".test" ), "Assert class present" );
+ e.toggleClass( valueObj( "test" ), true );
+ assert.ok( e.is( ".test" ), "Assert class still present" );
e.toggleClass( valueObj( "test" ), false );
assert.ok( !e.is( ".test" ), "Assert class not present" );

0 comments on commit 4bf1a09

Please sign in to comment.