framework/sage
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master

Browse Source
This commit is contained in:
Ben Word
2013-03-04 21:30:25 -06:00
parent 947b4a1cb9 ac8d15b509
commit 838bea1402
23 changed files with 261 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/js/plugins/bootstrap/bootstrap-dropdown.js vendored
View File

@@ -1,5 +1,5 @@
/* ============================================================
* bootstrap-dropdown.js v2.3.0
* bootstrap-dropdown.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
@@ -158,7 +158,7 @@
$(document)
.on('click.dropdown.data-api', clearMenus)
.on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
.on('.dropdown-menu', function (e) { e.stopPropagation() })
.on('click.dropdown-menu', function (e) { e.stopPropagation() })
.on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)