diff options
| author | fat-kun <[email protected]> | 2013-02-28 21:24:27 -0800 |
|---|---|---|
| committer | fat-kun <[email protected]> | 2013-02-28 21:24:27 -0800 |
| commit | eb24718add4dd36fe92fdbdb79e6ff4ce5919300 (patch) | |
| tree | c85d91c9cb9b0b54f48f6747aa08d7db81eafce0 /js/bootstrap-dropdown.js | |
| parent | 16111a5e454a8af4407f4217b5defb6d7a9bdbd3 (diff) | |
| parent | 6b2a010357e184e670a2f4768e37d4886e8a6597 (diff) | |
| download | bootstrap-2.3.1.tar.xz bootstrap-2.3.1.zip | |
Merge pull request #7111 from twitter/2.3.1-wipv2.3.1
2.3.1 wip
Diffstat (limited to 'js/bootstrap-dropdown.js')
| -rw-r--r-- | js/bootstrap-dropdown.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index ec86cf0d7..a1d51519f 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -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) |