mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
This commit is contained in:
commit
9bedfa447c
@ -15,15 +15,6 @@ $(function(){
|
|||||||
// }, 0);
|
// }, 0);
|
||||||
|
|
||||||
|
|
||||||
// Docs topbar nav
|
|
||||||
// ===============
|
|
||||||
|
|
||||||
$('.nav .active').on('click', function (e) {
|
|
||||||
e.preventDefault()
|
|
||||||
$(this).siblings().toggle()
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
// table sort example
|
// table sort example
|
||||||
// ==================
|
// ==================
|
||||||
|
|
||||||
|
2
js/bootstrap-dropdown.js
vendored
2
js/bootstrap-dropdown.js
vendored
@ -74,7 +74,7 @@
|
|||||||
* =================================== */
|
* =================================== */
|
||||||
|
|
||||||
$(function () {
|
$(function () {
|
||||||
$('html').on('click.dropdown.data-api', clearMenus)
|
$(window).on('click.dropdown.data-api', clearMenus)
|
||||||
$('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
|
$('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user