mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-21 18:54:30 +01:00
clean up js api for dropdowns
This commit is contained in:
parent
ab8f4a394c
commit
d465952138
2
docs/assets/css/bootstrap.css
vendored
2
docs/assets/css/bootstrap.css
vendored
@ -1986,7 +1986,7 @@ table .span12 {
|
|||||||
.navbar-search .search-query :-moz-placeholder {
|
.navbar-search .search-query :-moz-placeholder {
|
||||||
color: #eeeeee;
|
color: #eeeeee;
|
||||||
}
|
}
|
||||||
.navbar-search .search-query ::-webkit-input-placeholder {
|
.navbar-search .search-query::-webkit-input-placeholder {
|
||||||
color: #eeeeee;
|
color: #eeeeee;
|
||||||
}
|
}
|
||||||
.navbar-search .search-query:hover {
|
.navbar-search .search-query:hover {
|
||||||
|
6
js/bootstrap-dropdown.js
vendored
6
js/bootstrap-dropdown.js
vendored
@ -27,7 +27,10 @@
|
|||||||
|
|
||||||
var toggle = '[data-toggle="dropdown"]'
|
var toggle = '[data-toggle="dropdown"]'
|
||||||
, Dropdown = function ( element ) {
|
, Dropdown = function ( element ) {
|
||||||
$(element).bind('click', this.toggle)
|
var $el = $(element).on('click.dropdown.data-api', this.toggle)
|
||||||
|
$('html').on('click.dropdown.data-api', function () {
|
||||||
|
$el.parent().removeClass('open')
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
Dropdown.prototype = {
|
Dropdown.prototype = {
|
||||||
@ -51,7 +54,6 @@
|
|||||||
isActive = $parent.hasClass('open')
|
isActive = $parent.hasClass('open')
|
||||||
|
|
||||||
clearMenus()
|
clearMenus()
|
||||||
|
|
||||||
!isActive && $parent.toggleClass('open')
|
!isActive && $parent.toggleClass('open')
|
||||||
|
|
||||||
return false
|
return false
|
||||||
|
Loading…
x
Reference in New Issue
Block a user