aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.tabs.js
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2012-11-23 13:49:12 +0100
committerFelix Nagel <info@felixnagel.com>2012-11-23 13:49:12 +0100
commite25cdd88e7f2558311492957e379e11f987a1080 (patch)
treea0353f8f3ef49537618721d0bbd7cfab2b432759 /ui/jquery.ui.tabs.js
parent0d4a8dca55562131212f2638af4bf05052a41b2a (diff)
parent421aeaa08135e747ff9f2a59974c26b350cdcda7 (diff)
downloadjquery-ui-e25cdd88e7f2558311492957e379e11f987a1080.tar.gz
jquery-ui-e25cdd88e7f2558311492957e379e11f987a1080.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.tabs.js')
-rw-r--r--ui/jquery.ui.tabs.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/jquery.ui.tabs.js b/ui/jquery.ui.tabs.js
index 5b5227128..0b6480123 100644
--- a/ui/jquery.ui.tabs.js
+++ b/ui/jquery.ui.tabs.js
@@ -684,8 +684,6 @@ $.widget( "ui.tabs", {
.removeClass( "ui-tabs-anchor" )
.removeAttr( "role" )
.removeAttr( "tabIndex" )
- .removeData( "href.tabs" )
- .removeData( "load.tabs" )
.removeUniqueId();
this.tabs.add( this.panels ).each(function() {
@@ -710,7 +708,9 @@ $.widget( "ui.tabs", {
var li = $( this ),
prev = li.data( "ui-tabs-aria-controls" );
if ( prev ) {
- li.attr( "aria-controls", prev );
+ li
+ .attr( "aria-controls", prev )
+ .removeData( "ui-tabs-aria-controls" );
} else {
li.removeAttr( "aria-controls" );
}