Skip to content
Permalink
Browse files

All: Use .toggleClass() instead of conditionally using .addClass() an…

…d .removeClass(). Fixes #6764 - Use toggleClass instead of [ bool ? 'addClass' : 'removeClass' ].
  • Loading branch information...
xavi- authored and scottgonzalez committed Dec 19, 2010
1 parent d6edba5 commit 956697bfca1b386ae20eb27ccfd8c1df3234f1f2
Showing with 6 additions and 13 deletions.
  1. +1 −2 ui/jquery.ui.accordion.js
  2. +1 −2 ui/jquery.ui.sortable.js
  3. +3 −6 ui/jquery.ui.tabs.js
  4. +1 −3 ui/jquery.ui.widget.js
@@ -187,8 +187,7 @@ $.widget( "ui.accordion", {
// so we need to add the disabled class to the headers and panels
if ( key == "disabled" ) {
this.headers.add(this.headers.next())
[ value ? "addClass" : "removeClass" ](
"ui-accordion-disabled ui-state-disabled" );
.toggleClass( "ui-accordion-disabled ui-state-disabled", !!value );
}
},

@@ -77,8 +77,7 @@ $.widget("ui.sortable", $.ui.mouse, {
if ( key === "disabled" ) {
this.options[ key ] = value;

this.widget()
[ value ? "addClass" : "removeClass"]( "ui-sortable-disabled" );
this.widget().toggleClass( "ui-sortable-disabled", !!value );
} else {
// Don't call widget base _setOption for disable as it adds ui-state-disabled class
$.Widget.prototype._setOption.apply(this, arguments);
@@ -233,9 +233,7 @@ $.widget( "ui.tabs", {
o.selected = this.lis.index( this.lis.filter( ".ui-tabs-selected" ) );
}

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

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

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

// reset cache if switching from cached to not cached
@@ -212,9 +212,7 @@ $.Widget.prototype = {

if ( key === "disabled" ) {
this.widget()
[ value ? "addClass" : "removeClass"](
this.widgetBaseClass + "-disabled" + " " +
"ui-state-disabled" )
.toggleClass( this.widgetBaseClass + "-disabled ui-state-disabled", !!value )
.attr( "aria-disabled", value );
}

0 comments on commit 956697b

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