Skip to content
Permalink
Browse files

Tabs: Removed show event. Fixes #7155 - Tabs: Remove show event.

  • Loading branch information...
scottgonzalez committed Oct 25, 2012
1 parent 7cf2719 commit a1fd49fb2944a7dbe76e81ba648c2b56e7c6651d
Showing with 3 additions and 59 deletions.
  1. +2 −3 tests/unit/tabs/tabs_common_deprecated.js
  2. +0 −40 tests/unit/tabs/tabs_deprecated.js
  3. +1 −16 ui/jquery.ui.tabs.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
}
});
@@ -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 );

@@ -1046,20 +1046,11 @@ if ( $.uiBackCompat !== false ) {
}
});

// show and select event
// select event
$.widget( "ui.tabs", $.ui.tabs, {
options: {
show: null,
select: null
},
_create: function() {
this._super();
if ( this.options.active !== false ) {
this._trigger( "show", null, this._ui(
this.active.find( ".ui-tabs-anchor" )[ 0 ],
this._getPanelForTab( this.active )[ 0 ] ) );
}
},
_trigger: function( type, event, data ) {
var ret = this._superApply( arguments );
if ( !ret ) {
@@ -1071,12 +1062,6 @@ if ( $.uiBackCompat !== false ) {
panel: data.newPanel[ 0 ],
index: data.newTab.closest( "li" ).index()
});
} else if ( type === "activate" && data.newTab.length ) {
ret = this._super( "show", event, {
tab: data.newTab.find( ".ui-tabs-anchor" )[ 0 ],
panel: data.newPanel[ 0 ],
index: data.newTab.closest( "li" ).index()
});
}
return ret;
}

0 comments on commit a1fd49f

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