Tabs: Use aria-controls instead of the anchor's href to match against location.hash...

diff --git a/tests/unit/tabs/tabs_options.js b/tests/unit/tabs/tabs_options.js
index 5a90ff89528df8a54f45f12d23c0b093ca44e5a2..1b468f2b61dd7ba5eae6abeac2a17d128088f0ff 100644 (file)
--- a/tests/unit/tabs/tabs_options.js
+++ b/tests/unit/tabs/tabs_options.js
@@ -7,7 +7,7 @@ var disabled = TestHelpers.tabs.disabled,
 module( "tabs: options" );
 
 test( "{ active: default }", function() {
-       expect( 4 );
+       expect( 6 );
 
        var element = $( "#tabs1" ).tabs();
        equal( element.tabs( "option", "active" ), 0, "should be 0 by default" );
@@ -19,6 +19,12 @@ test( "{ active: default }", function() {
        equal( element.tabs( "option", "active" ), 2, "should be 2 based on URL" );
        state( element, 0, 0, 1 );
        element.tabs( "destroy" );
+
+       location.hash = "#custom-id";
+       element = $( "#tabs2" ).tabs();
+       equal( element.tabs( "option", "active" ), 3, "should be 3 based on URL" );
+       state( element, 0, 0, 0, 1, 0 );
+       element.tabs( "destroy" );
        location.hash = "#";
 });
 

diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index baf55d8dc656e8d937eb07c85501649324dff765..7d38fb46ea31547127de4875569d865f167da312 100644 (file)
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -51,7 +51,8 @@ $.widget( "ui.tabs", {
                var panel,
                        that = this,
                        options = this.options,
-                       active = options.active;
+                       active = options.active,
+                       locationHash = location.hash.substring( 1 );
 
                this.running = false;
 
@@ -80,9 +81,9 @@ $.widget( "ui.tabs", {
 
                if ( active === null ) {
                        // check the fragment identifier in the URL
-                       if ( location.hash ) {
-                               this.anchors.each(function( i, anchor ) {
-                                       if ( anchor.hash === location.hash ) {
+                       if ( locationHash ) {
+                               this.tabs.each(function( i, tab ) {
+                                       if ( $( tab ).attr( "aria-controls" ) === locationHash ) {
                                                active = i;
                                                return false;
                                        }