Skip to content

Commit 3568146

Browse files
fatfat
committed
only stop prop on form – as people seem to be relying on dropdown hiding when clicking internal elements
1 parent 215d92b commit 3568146

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

‎docs/assets/js/bootstrap-dropdown.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110

111111
if (!selector) {
112112
selector = $this.attr('href')
113-
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
113+
selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
114114
}
115115

116116
$parent = $(selector)
@@ -142,7 +142,7 @@
142142
$('html')
143143
.on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
144144
$('body')
145-
.on('click.dropdown touchstart.dropdown.data-api', '.dropdown', function (e) { e.stopPropagation() })
145+
.on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
146146
.on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
147147
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
148148
})

‎docs/assets/js/bootstrap.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@
685685

686686
if (!selector) {
687687
selector = $this.attr('href')
688-
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
688+
selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
689689
}
690690

691691
$parent = $(selector)
@@ -717,7 +717,7 @@
717717
$('html')
718718
.on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
719719
$('body')
720-
.on('click.dropdown touchstart.dropdown.data-api', '.dropdown', function (e) { e.stopPropagation() })
720+
.on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
721721
.on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
722722
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
723723
})

0 commit comments

Comments
 (0)