2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00

remove aria-control stuff

This commit is contained in:
Jacob Thornton
2011-09-09 00:00:03 -07:00
parent 1a8fb2dbf7
commit b086d94253
2 changed files with 8 additions and 10 deletions
+4 -4
View File
@@ -11,17 +11,17 @@
, $ul = $(e.liveFired)
, $controlled
if (/^#/.test(href)) {
if (/^#\w+/.test(href)) {
e.preventDefault()
if ($this.hasClass('active')) {
return
}
$controlled = $('#' + $ul.attr('aria-controls'))
$href = $(href)
activate($this.parent('li'), $ul)
activate($(href, $controlled), $controlled)
activate($href, $href.parent())
}
}
@@ -31,7 +31,7 @@
$.fn.tabs = $.fn.pills = function () {
return this.each(function () {
$(this).delegate('.tabs > li > a, .pills > li > a', 'click', tab)
$(this).delegate('.tabs > li > a, .pills > li > a, .dropdown-menu > li > a', 'click', tab)
})
}