Skip to content

Tabs: Rename ui-tab class to ui-tabs-tab for consistent prefixes #1538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jzaefferer merged 1 commit into from
Apr 18, 2015
Merged

Tabs: Rename ui-tab class to ui-tabs-tab for consistent prefixes #1538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion tests/unit/tabs/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var state = testHelper.state;
module( "tabs: core" );

test( "markup structure", function( assert ) {
expect( 17 );
expect( 20 );
var element = $( "#tabs1" ).tabs(),
tabList = element.find( "ul, ol" ),
tabs = tabList.find( "li" ),
Expand All @@ -21,9 +21,15 @@ test( "markup structure", function( assert ) {
assert.lacksClasses( element, "ui-tabs-collapsible" );
assert.hasClasses( tabList, "ui-tabs-nav ui-widget-header" );
equal( tabList.length, 1, "The widget contains exactly one tab list" );
assert.hasClasses( tabs[ 0 ], "ui-tabs-tab" );
assert.hasClasses( tabs[ 1 ], "ui-tabs-tab" );
assert.hasClasses( tabs[ 2 ], "ui-tabs-tab" );

// DEPRECATED
assert.hasClasses( tabs[ 0 ], "ui-tab" );
assert.hasClasses( tabs[ 1 ], "ui-tab" );
assert.hasClasses( tabs[ 2 ], "ui-tab" );

equal( tabs.length, 3, "There are exactly three tabs" );
assert.hasClasses( anchors[ 0 ], "ui-tabs-anchor" );
assert.hasClasses( anchors[ 1 ], "ui-tabs-anchor" );
Expand Down
19 changes: 17 additions & 2 deletions ui/tabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
}
}( function( $ ) {

return $.widget( "ui.tabs", {
$.widget( "ui.tabs", {
version: "@VERSION",
delay: 300,
options: {
Expand Down Expand Up @@ -417,7 +417,7 @@ return $.widget( "ui.tabs", {
role: "tab",
tabIndex: -1
} );
this._addClass( this.tabs, "ui-tab", "ui-state-default" );
this._addClass( this.tabs, "ui-tabs-tab", "ui-state-default" );

this.anchors = this.tabs.map( function() {
return $( "a", this )[ 0 ];
Expand Down Expand Up @@ -880,4 +880,19 @@ return $.widget( "ui.tabs", {
}
} );

// DEPRECATED
// TODO: Switch return back to widget declaration at top of file when this is removed
if ( $.uiBackCompat !== false ) {

// Backcompat for ui-tab class (now ui-tabs-tab)
$.widget( "ui.tabs", $.ui.tabs, {
_processTabs: function() {
this._superApply( arguments );
this._addClass( this.tabs, "ui-tab" );
}
} );
}

return $.ui.tabs;

} ) );