diff options
| author | Mark Otto <[email protected]> | 2013-12-18 13:06:47 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-18 13:06:47 -0800 |
| commit | 5bba8744679ddead8673c003997410c71fc47000 (patch) | |
| tree | 7cb520f428a788652871240a19a9fcc401ecf9f6 /js/dropdown.js | |
| parent | 6315043b1c11c6391f155e0c7299783a13cfee74 (diff) | |
| parent | 3f577ab86c4e07493d5d24f5fdd3dba30c199400 (diff) | |
| download | bootstrap-5bba8744679ddead8673c003997410c71fc47000.tar.xz bootstrap-5bba8744679ddead8673c003997410c71fc47000.zip | |
Merge branch 'master' into docs_derp
Diffstat (limited to 'js/dropdown.js')
| -rw-r--r-- | js/dropdown.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/dropdown.js b/js/dropdown.js index 3f71c7569..56e9b2899 100644 --- a/js/dropdown.js +++ b/js/dropdown.js @@ -148,7 +148,7 @@ $(document) .on('click.bs.dropdown.data-api', clearMenus) .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) - .on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle) - .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) + .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle) + .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]', Dropdown.prototype.keydown) }(jQuery); |