Skip to content

Commit 956697b

Browse files
xavi-scottgonzalez
authored andcommitted
All: Use .toggleClass() instead of conditionally using .addClass() and .removeClass(). Fixes #6764 - Use toggleClass instead of [ bool ? 'addClass' : 'removeClass' ].
1 parent d6edba5 commit 956697b

File tree

4 files changed

+6
-13
lines changed

4 files changed

+6
-13
lines changed

ui/jquery.ui.accordion.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,7 @@ $.widget( "ui.accordion", {
187187
// so we need to add the disabled class to the headers and panels
188188
if ( key == "disabled" ) {
189189
this.headers.add(this.headers.next())
190-
[ value ? "addClass" : "removeClass" ](
191-
"ui-accordion-disabled ui-state-disabled" );
190+
.toggleClass( "ui-accordion-disabled ui-state-disabled", !!value );
192191
}
193192
},
194193

ui/jquery.ui.sortable.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ $.widget("ui.sortable", $.ui.mouse, {
7777
if ( key === "disabled" ) {
7878
this.options[ key ] = value;
7979

80-
this.widget()
81-
[ value ? "addClass" : "removeClass"]( "ui-sortable-disabled" );
80+
this.widget().toggleClass( "ui-sortable-disabled", !!value );
8281
} else {
8382
// Don't call widget base _setOption for disable as it adds ui-state-disabled class
8483
$.Widget.prototype._setOption.apply(this, arguments);

ui/jquery.ui.tabs.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,7 @@ $.widget( "ui.tabs", {
233233
o.selected = this.lis.index( this.lis.filter( ".ui-tabs-selected" ) );
234234
}
235235

236-
// update collapsible
237-
// TODO: use .toggleClass()
238-
this.element[ o.collapsible ? "addClass" : "removeClass" ]( "ui-tabs-collapsible" );
236+
this.element.toggleClass( "ui-tabs-collapsible", o.collapsible );
239237

240238
// set or update cookie after init and add/remove respectively
241239
if ( o.cookie ) {
@@ -244,9 +242,8 @@ $.widget( "ui.tabs", {
244242

245243
// disable tabs
246244
for ( var i = 0, li; ( li = this.lis[ i ] ); i++ ) {
247-
$( li )[ $.inArray( i, o.disabled ) != -1 &&
248-
// TODO: use .toggleClass()
249-
!$( li ).hasClass( "ui-tabs-selected" ) ? "addClass" : "removeClass" ]( "ui-state-disabled" );
245+
$( li ).toggleClass( "ui-state-disabled",
246+
$.inArray( i, o.disabled ) != -1 && !$( li ).hasClass( "ui-tabs-selected" ) );
250247
}
251248

252249
// reset cache if switching from cached to not cached

ui/jquery.ui.widget.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,7 @@ $.Widget.prototype = {
212212

213213
if ( key === "disabled" ) {
214214
this.widget()
215-
[ value ? "addClass" : "removeClass"](
216-
this.widgetBaseClass + "-disabled" + " " +
217-
"ui-state-disabled" )
215+
.toggleClass( this.widgetBaseClass + "-disabled ui-state-disabled", !!value )
218216
.attr( "aria-disabled", value );
219217
}
220218

0 commit comments

Comments
 (0)