Commit 9bedfa44 authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

parents c56e9d2d 314feb70
Showing with 1 addition and 10 deletions
+1 -10
...@@ -15,15 +15,6 @@ $(function(){ ...@@ -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
// ================== // ==================
......
...@@ -74,7 +74,7 @@ ...@@ -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)
}) })
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment