diff options
| author | Jacob Thornton <[email protected]> | 2012-03-19 23:13:55 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-03-19 23:13:55 -0700 |
| commit | 663e41d74f6369812da29a1dd66b0b1fcfd22827 (patch) | |
| tree | efbbd8e0098dc977e8be9c344f097c7e96584e7b /docs | |
| parent | 63bd7cb478500463ac7339667d89792f7108f3c0 (diff) | |
| download | bootstrap-663e41d74f6369812da29a1dd66b0b1fcfd22827.tar.xz bootstrap-663e41d74f6369812da29a1dd66b0b1fcfd22827.zip | |
prevent dropdowns from closing when clicking inside form element inside dropdown
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 55871 -> 55902 bytes | |||
| -rw-r--r-- | docs/assets/js/bootstrap-dropdown.js | 4 | ||||
| -rw-r--r-- | docs/assets/js/bootstrap-typeahead.js | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 84b91830f..b23cd19c9 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js index 54b61c5e9..f26b83f41 100644 --- a/docs/assets/js/bootstrap-dropdown.js +++ b/docs/assets/js/bootstrap-dropdown.js @@ -86,7 +86,9 @@ $(function () { $('html').on('click.dropdown.data-api', clearMenus) - $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) + $('body') + .on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) }) }( window.jQuery );
\ No newline at end of file diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js index 804e60dc4..f4d26186c 100644 --- a/docs/assets/js/bootstrap-typeahead.js +++ b/docs/assets/js/bootstrap-typeahead.js @@ -39,8 +39,9 @@ , select: function () { var val = this.$menu.find('.active').attr('data-value') - this.$element.val(val) - this.$element.change(); + this.$element + .val(val) + .change() return this.hide() } |