diff options
author | Scott González <scott.gonzalez@gmail.com> | 2012-10-25 05:39:15 -0400 |
---|---|---|
committer | Scott González <scott.gonzalez@gmail.com> | 2012-10-25 05:39:15 -0400 |
commit | 0fc682a8dadc894caefe27c5a0fccf1eca30780d (patch) | |
tree | fa1975cab9b23af13cfa8f78056562f761306b6e | |
parent | 1a7958a43096ced70043514055e8f62422d860fd (diff) | |
download | jquery-ui-0fc682a8dadc894caefe27c5a0fccf1eca30780d.tar.gz jquery-ui-0fc682a8dadc894caefe27c5a0fccf1eca30780d.zip |
Tabs: Removed enable and disable events. Fixes #7160 - Tabs: Remove enable and disable events.
-rw-r--r-- | tests/unit/tabs/tabs_common_deprecated.js | 2 | ||||
-rw-r--r-- | tests/unit/tabs/tabs_deprecated.js | 32 | ||||
-rw-r--r-- | ui/jquery.ui.tabs.js | 40 |
3 files changed, 0 insertions, 74 deletions
diff --git a/tests/unit/tabs/tabs_common_deprecated.js b/tests/unit/tabs/tabs_common_deprecated.js index 72fecfbdd..2449a07d3 100644 --- a/tests/unit/tabs/tabs_common_deprecated.js +++ b/tests/unit/tabs/tabs_common_deprecated.js @@ -18,8 +18,6 @@ TestHelpers.commonWidgetTests( "tabs", { beforeActivate: null, beforeLoad: null, create: null, - disable: null, - enable: null, load: null, remove: null, select: null, diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js index 2de612853..6e84accdf 100644 --- a/tests/unit/tabs/tabs_deprecated.js +++ b/tests/unit/tabs/tabs_deprecated.js @@ -198,38 +198,6 @@ asyncTest( "load", function() { } }); -test( "enable", function() { - expect( 3 ); - - var element = $( "#tabs1" ).tabs({ - disabled: [ 0, 1 ], - enable: function( event, ui ) { - equal( ui.tab, element.find( ".ui-tabs-nav .ui-tabs-anchor" )[ 1 ], "ui.tab" ); - equal( ui.panel, element.find( ".ui-tabs-panel" )[ 1 ], "ui.panel" ); - equal( ui.index, 1, "ui.index" ); - } - }); - element.tabs( "enable", 1 ); - // shouldn't trigger event - element.tabs( "enable", 2 ); -}); - -test( "disable", function() { - expect( 3 ); - - var element = $( "#tabs1" ).tabs({ - disable: function( event, ui ) { - equal( ui.tab, element.find( ".ui-tabs-nav .ui-tabs-anchor" )[ 1 ], "ui.tab" ); - equal( ui.panel, element.find( ".ui-tabs-panel" )[ 1 ], "ui.panel" ); - equal( ui.index, 1, "ui.index" ); - } - }); - element.tabs( "disable", 1 ); - // shouldn't trigger event - element.tabs( "disable", 1 ); -}); - - test( "show", function() { expect( 13 ); diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js index 5f6d87eee..ed0ca1036 100644 --- a/ui/jquery.ui.tabs.js +++ b/ui/jquery.ui.tabs.js @@ -889,46 +889,6 @@ if ( $.uiBackCompat !== false ) { } }); - // enable/disable events - $.widget( "ui.tabs", $.ui.tabs, { - options: { - enable: null, - disable: null - }, - - enable: function( index ) { - var options = this.options, - trigger; - - if ( index && options.disabled === true || - ( $.isArray( options.disabled ) && $.inArray( index, options.disabled ) !== -1 ) ) { - trigger = true; - } - - this._superApply( arguments ); - - if ( trigger ) { - this._trigger( "enable", null, this._ui( this.anchors[ index ], this.panels[ index ] ) ); - } - }, - - disable: function( index ) { - var options = this.options, - trigger; - - if ( index && options.disabled === false || - ( $.isArray( options.disabled ) && $.inArray( index, options.disabled ) === -1 ) ) { - trigger = true; - } - - this._superApply( arguments ); - - if ( trigger ) { - this._trigger( "disable", null, this._ui( this.anchors[ index ], this.panels[ index ] ) ); - } - } - }); - // add/remove methods and events $.widget( "ui.tabs", $.ui.tabs, { options: { |