1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-28 15:50:01 +02:00

Merge branch 'tab-event' of https://github.com/kasperp/bootstrap into kasperp-tab-event

This commit is contained in:
Jacob Thornton
2011-09-29 22:18:08 -07:00
3 changed files with 54 additions and 10 deletions

View File

@@ -30,11 +30,12 @@
, href = $this.attr('href')
, $ul = $this.closest('ul')
, $controlled
, current = $ul.find('.active a').attr('href')
if (/^#\w+/.test(href)) {
e.preventDefault()
if ($this.hasClass('active')) {
if ($this.parent('li').hasClass('active')) {
return
}
@@ -42,6 +43,7 @@
activate($this.parent('li'), $ul)
activate($href, $href.parent())
$this.trigger("changed", {from:current, to:href})
}
}
@@ -59,4 +61,4 @@
$('body').tabs('ul[data-tabs] li > a, ul[data-pills] > li > a')
})
}( window.jQuery || window.ender );
}( window.jQuery || window.ender );

View File

@@ -11,39 +11,61 @@ $(function () {
})
test("should activate element by tab id", function () {
var tabsHTML = '<ul class="tabs">'
var $tabsHTML = $('<ul class="tabs">'
+ '<li class="active"><a href="#home">Home</a></li>'
+ '<li><a href="#profile">Profile</a></li>'
+ '</ul>'
+ '</ul>')
$('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo("#qunit-runoff")
$(tabsHTML).tabs().find('a').last().click()
$tabsHTML.tabs().find('a').last().click()
equals($("#qunit-runoff").find('.active').attr('id'), "profile")
$(tabsHTML).tabs().find('a').first().click()
$tabsHTML.tabs().find('a').first().click()
equals($("#qunit-runoff").find('.active').attr('id'), "home")
$("#qunit-runoff").empty()
})
test("should activate element by pill id", function () {
var pillsHTML = '<ul class="pills">'
var $pillsHTML = $('<ul class="pills">'
+ '<li class="active"><a href="#home">Home</a></li>'
+ '<li><a href="#profile">Profile</a></li>'
+ '</ul>'
+ '</ul>')
$('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo("#qunit-runoff")
$(pillsHTML).pills().find('a').last().click()
$pillsHTML.pills().find('a').last().click()
equals($("#qunit-runoff").find('.active').attr('id'), "profile")
$(pillsHTML).pills().find('a').first().click()
$pillsHTML.pills().find('a').first().click()
equals($("#qunit-runoff").find('.active').attr('id'), "home")
$("#qunit-runoff").empty()
})
test( "should trigger changed event on activate", function () {
var $tabsHTML = $('<ul class="tabs">'
+ '<li class="active"><a href="#home">Home</a></li>'
+ '<li><a href="#profile">Profile</a></li>'
+ '</ul>')
, changeCount = 0
, from
, to;
$tabsHTML.tabs().bind( "changed", function (e, c){
from = c.from;
to = c.to;
changeCount++
})
$tabsHTML.tabs().find('a').last().click()
equals(from, "#home")
equals(to, "#profile")
equals(changeCount, 1)
})
})