Skip to content

Commit a442110

Browse files
mgolmgol
authored
Attributes: Drop the toggleClass(boolean|undefined) signature
The behavior of this signature is not intuitive, especially if classes are manipulated via other ways between `toggleClass` calls. Fixes gh-3388 Closes gh-4766
1 parent 68b4ec5 commit a442110

2 files changed

Lines changed: 15 additions & 62 deletions

File tree

‎src/attributes/classes.js‎

Lines changed: 14 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import jQuery from "../core.js";
22
import stripAndCollapse from "../core/stripAndCollapse.js";
33
import rnothtmlwhite from "../var/rnothtmlwhite.js";
4-
import dataPriv from "../data/var/dataPriv.js";
54

65
import "../core/init.js";
76

@@ -103,13 +102,6 @@ jQuery.fn.extend( {
103102
},
104103

105104
toggleClass: function( value, stateVal ) {
106-
var type = typeof value,
107-
isValidValue = type === "string" || Array.isArray( value );
108-
109-
if ( typeof stateVal === "boolean" && isValidValue ) {
110-
return stateVal ? this.addClass( value ) : this.removeClass( value );
111-
}
112-
113105
if ( typeof value === "function" ) {
114106
return this.each( function( i ) {
115107
jQuery( this ).toggleClass(
@@ -119,45 +111,25 @@ jQuery.fn.extend( {
119111
} );
120112
}
121113

114+
if ( typeof stateVal === "boolean" ) {
115+
return stateVal ? this.addClass( value ) : this.removeClass( value );
116+
}
117+
122118
return this.each( function() {
123119
var className, i, self, classNames;
124120

125-
if ( isValidValue ) {
126-
127-
// Toggle individual class names
128-
i = 0;
129-
self = jQuery( this );
130-
classNames = classesToArray( value );
131-
132-
while ( ( className = classNames[ i++ ] ) ) {
133-
134-
// Check each className given, space separated list
135-
if ( self.hasClass( className ) ) {
136-
self.removeClass( className );
137-
} else {
138-
self.addClass( className );
139-
}
140-
}
141-
142-
// Toggle whole class name
143-
} else if ( value === undefined || type === "boolean" ) {
144-
className = getClass( this );
145-
if ( className ) {
121+
// Toggle individual class names
122+
i = 0;
123+
self = jQuery( this );
124+
classNames = classesToArray( value );
146125

147-
// Store className if set
148-
dataPriv.set( this, "__className__", className );
149-
}
126+
while ( ( className = classNames[ i++ ] ) ) {
150127

151-
// If the element has a class name or if we're passed `false`,
152-
// then remove the whole classname (if there was one, the above saved it).
153-
// Otherwise bring back whatever was previously saved (if anything),
154-
// falling back to the empty string if nothing was stored.
155-
if ( this.setAttribute ) {
156-
this.setAttribute( "class",
157-
className || value === false ?
158-
"" :
159-
dataPriv.get( this, "__className__" ) || ""
160-
);
128+
// Check each className given, space separated list
129+
if ( self.hasClass( className ) ) {
130+
self.removeClass( className );
131+
} else {
132+
self.addClass( className );
161133
}
162134
}
163135
} );

‎test/unit/attributes.js‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1415,7 +1415,7 @@ QUnit.test( "removeClass(undefined) is a no-op", function( assert ) {
14151415
} );
14161416

14171417
var testToggleClass = function( valueObj, assert ) {
1418-
assert.expect( 19 );
1418+
assert.expect( 11 );
14191419

14201420
var e = jQuery( "#firstp" );
14211421
assert.ok( !e.is( ".test" ), "Assert class not present" );
@@ -1443,25 +1443,6 @@ var testToggleClass = function( valueObj, assert ) {
14431443
assert.ok( ( e.is( ".testA.testC" ) && !e.is( ".testB" ) ), "Assert 1 class added, 1 class removed, and 1 class kept" );
14441444
e.toggleClass( valueObj( "testA testC" ) );
14451445
assert.ok( ( !e.is( ".testA" ) && !e.is( ".testB" ) && !e.is( ".testC" ) ), "Assert no class present" );
1446-
1447-
// toggleClass storage
1448-
e.toggleClass( true );
1449-
assert.ok( e[ 0 ].className === "", "Assert class is empty (data was empty)" );
1450-
e.addClass( "testD testE" );
1451-
assert.ok( e.is( ".testD.testE" ), "Assert class present" );
1452-
e.toggleClass();
1453-
assert.ok( !e.is( ".testD.testE" ), "Assert class not present" );
1454-
assert.ok( jQuery._data( e[ 0 ], "__className__" ) === "testD testE", "Assert data was stored" );
1455-
e.toggleClass();
1456-
assert.ok( e.is( ".testD.testE" ), "Assert class present (restored from data)" );
1457-
e.toggleClass( false );
1458-
assert.ok( !e.is( ".testD.testE" ), "Assert class not present" );
1459-
e.toggleClass( true );
1460-
assert.ok( e.is( ".testD.testE" ), "Assert class present (restored from data)" );
1461-
e.toggleClass();
1462-
e.toggleClass( false );
1463-
e.toggleClass();
1464-
assert.ok( e.is( ".testD.testE" ), "Assert class present (restored from data)" );
14651446
};
14661447

14671448
QUnit.test( "toggleClass(String|boolean|undefined[, boolean])", function( assert ) {

0 commit comments

Comments
 (0)