mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-03 15:24:19 +01:00
crude check to make sure element has a # for an id
This commit is contained in:
parent
601e252074
commit
4751a0a274
2
js/bootstrap-dropdown.js
vendored
2
js/bootstrap-dropdown.js
vendored
@ -110,7 +110,7 @@
|
|||||||
|
|
||||||
if (!selector) {
|
if (!selector) {
|
||||||
selector = $this.attr('href')
|
selector = $this.attr('href')
|
||||||
selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
|
selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
|
||||||
}
|
}
|
||||||
|
|
||||||
$parent = $(selector)
|
$parent = $(selector)
|
||||||
|
18
js/tests/unit/bootstrap-dropdown.js
vendored
18
js/tests/unit/bootstrap-dropdown.js
vendored
@ -61,6 +61,24 @@ $(function () {
|
|||||||
ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
|
ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test("should test if element has a # before assuming it's a selector", function () {
|
||||||
|
var dropdownHTML = '<ul class="tabs">'
|
||||||
|
+ '<li class="dropdown">'
|
||||||
|
+ '<a href="/foo/" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>'
|
||||||
|
+ '<ul class="dropdown-menu">'
|
||||||
|
+ '<li><a href="#">Secondary link</a></li>'
|
||||||
|
+ '<li><a href="#">Something else here</a></li>'
|
||||||
|
+ '<li class="divider"></li>'
|
||||||
|
+ '<li><a href="#">Another link</a></li>'
|
||||||
|
+ '</ul>'
|
||||||
|
+ '</li>'
|
||||||
|
+ '</ul>'
|
||||||
|
, dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
|
||||||
|
|
||||||
|
ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
test("should remove open class if body clicked", function () {
|
test("should remove open class if body clicked", function () {
|
||||||
var dropdownHTML = '<ul class="tabs">'
|
var dropdownHTML = '<ul class="tabs">'
|
||||||
+ '<li class="dropdown">'
|
+ '<li class="dropdown">'
|
||||||
|
Loading…
Reference in New Issue
Block a user