Tabs: Fixed enabled and disabled methods. Fixes #7142 - Tabs: Deprecate enable and...

diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js
index 25877e69c309f3c36c0b8030dd1d8c54b6ab5105..15df3cd25bdc41801ee5e362926c15de65db8412 100644 (file)
--- a/tests/unit/tabs/tabs_deprecated.js
+++ b/tests/unit/tabs/tabs_deprecated.js
@@ -152,39 +152,37 @@ test('selected', function() {
        equals(el.tabs('option', 'selected'), 1, 'should select tab');
 });
 
-module("tabs (deprecated): events");
+module( "tabs (deprecated): events" );
 
-test('enable', function() {
-       expect(4);
+test( "enable", function() {
+       expect( 3 );
 
-       var uiObj;
-       el = $('#tabs1').tabs({
+       var element = $( "#tabs1" ).tabs({
                disabled: [ 0, 1 ],
-               enable: function (event, ui) {
-                       uiObj = ui;
+               enable: function ( event, ui ) {
+                       equals( ui.tab, element.find( ".ui-tabs-nav a" )[ 1 ], "ui.tab" );
+                       equals( ui.panel, element.find( ".ui-tabs-panel" )[ 1 ], "ui.panel" );
+                       equals( ui.index, 1, "ui.index" );
                }
        });
-       el.tabs('enable', 1);
-       ok(uiObj !== undefined, 'trigger callback');
-       equals(uiObj.tab, $('a', el)[1], 'contain tab as DOM anchor element');
-       equals(uiObj.panel, $('div', el)[1], 'contain panel as DOM div element');
-       equals(uiObj.index, 1, 'contain index');
+       element.tabs( "enable", 1 );
+       // shouldn't trigger event
+       element.tabs( "enable", 2 );
 });
 
-test('disable', function() {
-       expect(4);
+test( "disable", function() {
+       expect( 3 );
 
-       var uiObj;
-       el = $('#tabs1').tabs({
-               disable: function (event, ui) {
-                       uiObj = ui;
+       var element = $( "#tabs1" ).tabs({
+               disable: function ( event, ui ) {
+               equals( ui.tab, element.find( ".ui-tabs-nav a" )[ 1 ], "ui.tab" );
+               equals( ui.panel, element.find( ".ui-tabs-panel" )[ 1 ], "ui.panel" );
+               equals( ui.index, 1, "ui.index" );
                }
        });
-       el.tabs('disable', 1);
-       ok(uiObj !== undefined, 'trigger callback');
-       equals(uiObj.tab, $('a', el)[1], 'contain tab as DOM anchor element');
-       equals(uiObj.panel, $('div', el)[1], 'contain panel as DOM div element');
-       equals(uiObj.index, 1, 'contain index');
+       element.tabs( "disable", 1 );
+       // shouldn't trigger event
+       element.tabs( "disable", 1 );
 });
 
 test('show', function() {

diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index 7946cc6673b5de72f02bb026c2d6265414a8d4cb..39969d655654bd7cf614d4a62b697df2d4d4c40e 100755 (executable)
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -783,10 +783,11 @@ if ( $.uiBackCompat !== false ) {
                        disable = prototype.disable;
 
                prototype.enable = function( index ) {
-                       var o = this.options,
+                       var options = this.options,
                                trigger;
 
-                       if ( index && o.disabled || ($.isArray( o.disabled ) && $.inArray( index, o.disabled ) !== -1 ) ) {
+                       if ( index && options.disabled === true ||
+                                       ( $.isArray( options.disabled ) && $.inArray( index, options.disabled ) !== -1 ) ) {
                                trigger = true;
                        }
 
@@ -798,10 +799,11 @@ if ( $.uiBackCompat !== false ) {
                };
 
                prototype.disable = function( index ) {
-                       var o = this.options,
+                       var options = this.options,
                                trigger;
 
-                       if ( index && !o.disabled || ($.isArray( o.disabled ) && $.inArray( index, o.disabled ) == -1 ) ) {
+                       if ( index && options.disabled === false ||
+                                       ( $.isArray( options.disabled ) && $.inArray( index, options.disabled ) === -1 ) ) {
                                trigger = true;
                        }