mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-24 21:40:17 +00:00
Merge pull request #362 from purcell/safe-dropdown-initialization
Add jquery.ready hook after defining plugin, to avoid breakage with modernizr/yepnope
This commit is contained in:
commit
b41175f030
27
js/bootstrap-dropdown.js
vendored
27
js/bootstrap-dropdown.js
vendored
@ -20,17 +20,6 @@
|
|||||||
|
|
||||||
!function( $ ){
|
!function( $ ){
|
||||||
|
|
||||||
var d = 'a.menu, .dropdown-toggle'
|
|
||||||
|
|
||||||
function clearMenus() {
|
|
||||||
$(d).parent('li').removeClass('open')
|
|
||||||
}
|
|
||||||
|
|
||||||
$(function () {
|
|
||||||
$('html').bind("click", clearMenus)
|
|
||||||
$('body').dropdown( '[data-dropdown] a.menu, [data-dropdown] .dropdown-toggle' )
|
|
||||||
})
|
|
||||||
|
|
||||||
/* DROPDOWN PLUGIN DEFINITION
|
/* DROPDOWN PLUGIN DEFINITION
|
||||||
* ========================== */
|
* ========================== */
|
||||||
|
|
||||||
@ -47,4 +36,18 @@
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
}( window.jQuery || window.ender );
|
/* APPLY TO STANDARD DROPDOWN ELEMENTS
|
||||||
|
* =================================== */
|
||||||
|
|
||||||
|
var d = 'a.menu, .dropdown-toggle'
|
||||||
|
|
||||||
|
function clearMenus() {
|
||||||
|
$(d).parent('li').removeClass('open')
|
||||||
|
}
|
||||||
|
|
||||||
|
$(function () {
|
||||||
|
$('html').bind("click", clearMenus)
|
||||||
|
$('body').dropdown( '[data-dropdown] a.menu, [data-dropdown] .dropdown-toggle' )
|
||||||
|
})
|
||||||
|
|
||||||
|
}( window.jQuery || window.ender );
|
||||||
|
Loading…
x
Reference in New Issue
Block a user