From 054b208a9990fd71d30285e707ad53dae5a48247 Mon Sep 17 00:00:00 2001 From: Scott González Date: Thu, 25 Oct 2012 06:10:00 -0400 Subject: Tabs: Removed all templating features. Fixes #7158 - Tabs: Remove add and remove methods. Fixes #7157 - Tabs: Remove templating (idPrefix, tabTemplate, panelTemplate options). Fixes #7149 - Tabs: Remove use of title attribute. --- tests/unit/all-active.html | 1 - tests/unit/all.html | 1 - tests/unit/subsuite.js | 3 +- tests/unit/tabs/tabs.html | 3 - tests/unit/tabs/tabs_common_deprecated.js | 23 ---- tests/unit/tabs/tabs_deprecated.html | 156 ------------------------- tests/unit/tabs/tabs_deprecated.js | 182 ------------------------------ 7 files changed, 1 insertion(+), 368 deletions(-) delete mode 100644 tests/unit/tabs/tabs_common_deprecated.js delete mode 100644 tests/unit/tabs/tabs_deprecated.html delete mode 100644 tests/unit/tabs/tabs_deprecated.js (limited to 'tests') diff --git a/tests/unit/all-active.html b/tests/unit/all-active.html index 36719acdf..f842aa5cc 100644 --- a/tests/unit/all-active.html +++ b/tests/unit/all-active.html @@ -36,7 +36,6 @@ //"sortable/sortable.html", "spinner/spinner.html", "tabs/tabs.html", - "tabs/tabs_deprecated.html", "tooltip/tooltip.html", "widget/widget.html" ]; diff --git a/tests/unit/all.html b/tests/unit/all.html index c1b5d0383..bc204c976 100644 --- a/tests/unit/all.html +++ b/tests/unit/all.html @@ -36,7 +36,6 @@ //"sortable/sortable.html", "spinner/spinner.html", "tabs/tabs.html", - "tabs/tabs_deprecated.html", "tooltip/tooltip.html", "widget/widget.html" ]; diff --git a/tests/unit/subsuite.js b/tests/unit/subsuite.js index 1a16a9e94..6238cb2b1 100644 --- a/tests/unit/subsuite.js +++ b/tests/unit/subsuite.js @@ -8,8 +8,7 @@ var versions = [ ], additionalTests = { accordion: [ "accordion_deprecated.html" ], - position: [ "position_deprecated.html" ], - tabs: [ "tabs_deprecated.html" ] + position: [ "position_deprecated.html" ] }; window.testAllVersions = function( widget ) { diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html index e6c954727..7c7982303 100644 --- a/tests/unit/tabs/tabs.html +++ b/tests/unit/tabs/tabs.html @@ -5,9 +5,6 @@ jQuery UI Tabs Test Suite - diff --git a/tests/unit/tabs/tabs_common_deprecated.js b/tests/unit/tabs/tabs_common_deprecated.js deleted file mode 100644 index a21489cda..000000000 --- a/tests/unit/tabs/tabs_common_deprecated.js +++ /dev/null @@ -1,23 +0,0 @@ -TestHelpers.commonWidgetTests( "tabs", { - defaults: { - active: null, - collapsible: false, - disabled: false, - event: "click", - heightStyle: "content", - hide: null, - idPrefix: "ui-tabs-", - panelTemplate: "

", - show: null, - tabTemplate: "

", - - // callbacks - activate: null, - add: null, - beforeActivate: null, - beforeLoad: null, - create: null, - load: null, - remove: null - } -}); diff --git a/tests/unit/tabs/tabs_deprecated.html b/tests/unit/tabs/tabs_deprecated.html deleted file mode 100644 index 3c476d0b4..000000000 --- a/tests/unit/tabs/tabs_deprecated.html +++ /dev/null @@ -1,156 +0,0 @@ - - - - - jQuery UI Tabs Test Suite - - - - - - - - - - - - - - - - - - - - - -

jQuery UI Tabs Test Suite

- - -

- -

1 -
- 3
- 4
-
2

- -

Lorem ipsum

- -

not a tab
tab

- -

- - diff --git a/tests/unit/tabs/tabs_deprecated.js b/tests/unit/tabs/tabs_deprecated.js deleted file mode 100644 index 9d3599494..000000000 --- a/tests/unit/tabs/tabs_deprecated.js +++ /dev/null @@ -1,182 +0,0 @@ -(function( $ ) { - -var state = TestHelpers.tabs.state; - -module( "tabs (deprecated): core" ); - -test( "panel ids", function() { - expect( 2 ); - - var element = $( "#tabs2" ).tabs(); - - element.one( "tabsbeforeload", function( event, ui ) { - equal( ui.panel.attr( "id" ), "∫ßáö_Սե", "from title attribute" ); - event.preventDefault(); - }); - element.tabs( "option", "active", 4 ); - - element.one( "tabsbeforeload", function( event, ui ) { - ok( /^ui-tabs-\d+$/.test( ui.panel.attr( "id" ) ), "generated id" ); - event.preventDefault(); - }); - element.tabs( "option", "active", 2 ); -}); - -module( "tabs (deprecated): options" ); - -test( "idPrefix", function() { - expect( 1 ); - - $( "#tabs2" ) - .one( "tabsbeforeload", function( event, ui ) { - ok( /^testing-\d+$/.test( ui.panel.attr( "id" ) ), "generated id" ); - event.preventDefault(); - }) - .tabs({ - idPrefix: "testing-", - active: 2 - }); -}); - -test( "tabTemplate + panelTemplate", function() { - // defaults are tested in the add method test - expect( 11 ); - - var tab, anchor, - element = $( "#tabs2" ).tabs({ - tabTemplate: "

#{label}

", - panelTemplate: "

" - }); - element.one( "tabsadd", function( event, ui ) { - var anchor = $( ui.tab ); - equal( ui.index, 5, "ui.index" ); - equal( anchor.text(), "New", "ui.tab" ); - equal( anchor.attr( "href" ), "http://example.com/#new", "tab href" ); - ok( anchor.parent().hasClass( "customTab" ), "tab custom class" ); - equal( ui.panel.id, "new", "ui.panel" ); - ok( $( ui.panel ).hasClass( "customPanel" ), "panel custom class" ); - }); - element.tabs( "add", "#new", "New" ); - tab = element.find( ".ui-tabs-nav li" ).last(); - anchor = tab.find( ".ui-tabs-anchor" ); - equal( tab.text(), "New", "label" ); - ok( tab.hasClass( "customTab" ), "tab custom class" ); - equal( anchor.attr( "href" ), "http://example.com/#new", "href" ); - equal( tab.attr( "aria-controls" ), "new", "aria-controls" ); - ok( element.find( "#new" ).hasClass( "customPanel" ), "panel custom class" ); -}); - -module( "tabs (deprecated): methods" ); - -test( "add", function() { - expect( 28 ); - - var tab, anchor, - element = $( "#tabs1" ).tabs(); - - function stripLeadingSlash( str ) { - return str.substr( str.charAt( 0 ) === "/" ? 1 : 0 ); - } - - state( element, 1, 0, 0 ); - - // add without index - element.one( "tabsadd", function( event, ui ) { - equal( ui.index, 3, "ui.index" ); - equal( $( ui.tab ).text(), "New", "ui.tab" ); - equal( ui.panel.id, "new", "ui.panel" ); - }); - element.tabs( "add", "#new", "New" ); - state( element, 1, 0, 0, 0 ); - tab = element.find( ".ui-tabs-nav li" ).last(); - anchor = tab.find( ".ui-tabs-anchor" ); - equal( tab.text(), "New", "label" ); - equal( stripLeadingSlash( anchor[0].pathname ), stripLeadingSlash( location.pathname ), "href pathname" ); - equal( anchor[0].hash, "#new", "href hash" ); - equal( tab.attr( "aria-controls" ), "new", "aria-controls" ); - ok( !tab.hasClass( "ui-state-hover" ), "not hovered" ); - anchor.simulate( "mouseover" ); - ok( tab.hasClass( "ui-state-hover" ), "hovered" ); - anchor.simulate( "click" ); - state( element, 0, 0, 0, 1 ); - - // add remote tab with index - element.one( "tabsadd", function( event, ui ) { - equal( ui.index, 1, "ui.index" ); - equal( $( ui.tab ).text(), "New Remote", "ui.tab" ); - equal( ui.panel.id, $( ui.tab ).closest( "li" ).attr( "aria-controls" ), "ui.panel" ); - }); - element.tabs( "add", "data/test.html", "New Remote", 1 ); - state( element, 0, 0, 0, 0, 1 ); - tab = element.find( ".ui-tabs-nav li" ).eq( 1 ); - anchor = tab.find( ".ui-tabs-anchor" ); - equal( tab.text(), "New Remote", "label" ); - equal( stripLeadingSlash( stripLeadingSlash( - anchor[0].pathname.replace( stripLeadingSlash( location.pathname ).split( "/" ).slice( 0, -1 ).join( "/" ), "" ) - ) ), "data/test.html", "href" ); - ok( /^ui-tabs-\d+$/.test( tab.attr( "aria-controls" ) ), "aria controls" ); - ok( !tab.hasClass( "ui-state-hover" ), "not hovered" ); - anchor.simulate( "mouseover" ); - ok( tab.hasClass( "ui-state-hover" ), "hovered" ); - anchor.simulate( "click" ); - state( element, 0, 1, 0, 0, 0 ); - - // add to empty tab set - element = $( "

" ).tabs(); - equal( element.tabs( "option", "active" ), false, "active: false on init" ); - element.one( "tabsadd", function( event, ui ) { - equal( ui.index, 0, "ui.index" ); - equal( $( ui.tab ).text(), "First", "ui.tab" ); - equal( ui.panel.id, "first", "ui.panel" ); - }); - element.tabs( "add", "#first", "First" ); - state( element, 1 ); - equal( element.tabs( "option", "active" ), 0, "active: 0 after add" ); -}); - -test( "#5069 - ui.tabs.add creates two tab panels when using a full URL", function() { - expect( 2 ); - - var element = $( "#tabs2" ).tabs(); - equal( element.children( "div" ).length, element.find( ".ui-tabs-nav li" ).length ); - element.tabs( "add", "/new", "New" ); - equal( element.children( "div" ).length, element.find( ".ui-tabs-nav li" ).length ); -}); - -test( "remove", function() { - expect( 17 ); - - var element = $( "#tabs1" ).tabs({ active: 1 }); - state( element, 0, 1, 0 ); - - element.one( "tabsremove", function( event, ui ) { - equal( ui.index, -1, "ui.index" ); - equal( $( ui.tab ).text(), "2", "ui.tab" ); - equal( ui.panel.id, "fragment-2", "ui.panel" ); - }); - element.tabs( "remove", 1 ); - state( element, 0, 1 ); - equal( element.tabs( "option", "active" ), 1 ); - equal( element.find( ".ui-tabs-nav li a[href$='fragment-2']" ).length, 0, - "remove correct list item" ); - equal( element.find( "#fragment-2" ).length, 0, "remove correct panel" ); - - element.one( "tabsremove", function( event, ui ) { - equal( ui.index, -1, "ui.index" ); - equal( $( ui.tab ).text(), "3", "ui.tab" ); - equal( ui.panel.id, "fragment-3", "ui.panel" ); - }); - element.tabs( "remove", 1 ); - state( element, 1 ); - equal( element.tabs( "option", "active"), 0 ); - - element.one( "tabsremove", function( event, ui ) { - equal( ui.index, -1, "ui.index" ); - equal( $( ui.tab ).text(), "1", "ui.tab" ); - equal( ui.panel.id, "fragment-1", "ui.panel" ); - }); - element.tabs( "remove", 0 ); - equal( element.tabs( "option", "active" ), false ); -}); - -}( jQuery ) ); -- cgit v1.2.3