aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2012-10-25 05:44:22 -0400
committerScott González <scott.gonzalez@gmail.com>2012-10-25 05:44:22 -0400
commita1fd49fb2944a7dbe76e81ba648c2b56e7c6651d (patch)
tree731a82e580915a3fa20c548d6679b5543d7a9a1a /tests
parent7cf2719d0c406c7ff17c7e784c0e1e6eb23b562a (diff)
downloadjquery-ui-a1fd49fb2944a7dbe76e81ba648c2b56e7c6651d.tar.gz
jquery-ui-a1fd49fb2944a7dbe76e81ba648c2b56e7c6651d.zip
Tabs: Removed show event. Fixes #7155 - Tabs: Remove show event.
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/tabs/tabs_common_deprecated.js5
-rw-r--r--tests/unit/tabs/tabs_deprecated.js40
2 files changed, 2 insertions, 43 deletions
diff --git a/tests/unit/tabs/tabs_common_deprecated.js b/tests/unit/tabs/tabs_common_deprecated.js
index 2449a07d3..763e0d84e 100644
--- a/tests/unit/tabs/tabs_common_deprecated.js
+++ b/tests/unit/tabs/tabs_common_deprecated.js
@@ -8,7 +8,7 @@ TestHelpers.commonWidgetTests( "tabs", {
hide: null,
idPrefix: "ui-tabs-",
panelTemplate: "<div></div>",
- // show: null, // conflicts with old show callback
+ show: null,
spinner: "<em>Loading&#8230;</em>",
tabTemplate: "<li><a href='#{href}'><span>#{label}</span></a></li>",
@@ -20,7 +20,6 @@ TestHelpers.commonWidgetTests( "tabs", {
create: null,
load: null,
remove: null,
- select: null,
- show: null
+ select: null
}
});
diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js
index b551b3279..5f91f1b52 100644
--- a/tests/unit/tabs/tabs_deprecated.js
+++ b/tests/unit/tabs/tabs_deprecated.js
@@ -198,46 +198,6 @@ asyncTest( "load", function() {
}
});
-test( "show", function() {
- expect( 13 );
-
- var element = $( "#tabs1" ).tabs({
- active: false,
- collapsible: true
- }),
- anchors = element.find( ".ui-tabs-nav .ui-tabs-anchor" ),
- panels = element.find( ".ui-tabs-panel" );
-
- // from collapsed
- element.one( "tabsshow", function( event, ui ) {
- ok( !( "originalEvent" in event ), "originalEvent" );
- strictEqual( ui.tab, anchors[ 0 ], "ui.tab" );
- strictEqual( ui.panel, panels[ 0 ], "ui.panel" );
- equal( ui.index, 0, "ui.index" );
- state( element, 1, 0, 0 );
- });
- element.tabs( "option", "active", 0 );
- state( element, 1, 0, 0 );
-
- // switching tabs
- element.one( "tabsshow", function( event, ui ) {
- equal( event.originalEvent.type, "click", "originalEvent" );
- strictEqual( ui.tab, anchors[ 1 ], "ui.tab" );
- strictEqual( ui.panel, panels[ 1 ], "ui.panel" );
- equal( ui.index, 1, "ui.index" );
- state( element, 0, 1, 0 );
- });
- anchors.eq( 1 ).click();
- state( element, 0, 1, 0 );
-
- // collapsing
- element.one( "tabsshow", function() {
- ok( false, "collapsing" );
- });
- element.tabs( "option", "active", false );
- state( element, 0, 0, 0 );
-});
-
test( "select", function() {
expect( 13 );