2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-17 19:21:23 +03:00

all unit tests passing in ie7

This commit is contained in:
Jacob Thornton
2012-01-28 01:35:13 -08:00
parent 81c128fd0b
commit e61164e67a
10 changed files with 39 additions and 19 deletions
+9 -4
View File
@@ -36,9 +36,14 @@
, show: function () {
var $this = this.element
, $ul = $this.closest('ul:not(.dropdown-menu)')
, href = $this.attr('data-target') || $this.attr('href')
, selector = $this.attr('data-target')
, previous
, $href
, $target
if (!selector) {
selector = $this.attr('href')
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
if ( $this.parent('li').hasClass('active') ) return
@@ -49,10 +54,10 @@
, relatedTarget: previous
})
$href = $(href)
$target = $(selector)
this.activate($this.parent('li'), $ul)
this.activate($href, $href.parent(), function () {
this.activate($target, $target.parent(), function () {
$this.trigger({
type: 'shown'
, relatedTarget: previous