From 663e41d74f6369812da29a1dd66b0b1fcfd22827 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 23:13:55 -0700 Subject: prevent dropdowns from closing when clicking inside form element inside dropdown --- docs/assets/bootstrap.zip | Bin 55871 -> 55902 bytes docs/assets/js/bootstrap-dropdown.js | 4 +++- docs/assets/js/bootstrap-typeahead.js | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 84b91830f..b23cd19c9 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ 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() } -- cgit v1.2.3