mirror of
https://github.com/twbs/bootstrap.git
synced 2025-04-06 23:57:36 +02:00
commit
24b5e6cb14
2
js/bootstrap-tab.js
vendored
2
js/bootstrap-tab.js
vendored
@ -49,7 +49,7 @@
|
|||||||
|
|
||||||
if ( $this.parent('li').hasClass('active') ) return
|
if ( $this.parent('li').hasClass('active') ) return
|
||||||
|
|
||||||
previous = $ul.find('.active a').last()[0]
|
previous = $ul.find('.active:last a')[0]
|
||||||
|
|
||||||
e = $.Event('show', {
|
e = $.Event('show', {
|
||||||
relatedTarget: previous
|
relatedTarget: previous
|
||||||
|
19
js/tests/unit/bootstrap-tab.js
vendored
19
js/tests/unit/bootstrap-tab.js
vendored
@ -58,4 +58,23 @@ $(function () {
|
|||||||
.tab('show')
|
.tab('show')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test("show and shown events should reference correct relatedTarget", function () {
|
||||||
|
var dropHTML =
|
||||||
|
'<ul class="drop">'
|
||||||
|
+ '<li class="dropdown"><a data-toggle="dropdown" href="#">1</a>'
|
||||||
|
+ '<ul class="dropdown-menu">'
|
||||||
|
+ '<li><a href="#1-1" data-toggle="tab">1-1</a></li>'
|
||||||
|
+ '<li><a href="#1-2" data-toggle="tab">1-2</a></li>'
|
||||||
|
+ '</ul>'
|
||||||
|
+ '</li>'
|
||||||
|
+ '</ul>'
|
||||||
|
|
||||||
|
$(dropHTML).find('ul>li:first a').tab('show').end()
|
||||||
|
.find('ul>li:last a').on('show', function(event){
|
||||||
|
equals(event.relatedTarget.hash, "#1-1")
|
||||||
|
}).on('shown', function(event){
|
||||||
|
equals(event.relatedTarget.hash, "#1-1")
|
||||||
|
}).tab('show')
|
||||||
|
})
|
||||||
|
|
||||||
})
|
})
|
Loading…
x
Reference in New Issue
Block a user