Skip to content

Commit ef1ce9a

Browse files
Johann-Scvrebert
authored andcommitted
Fix triggering of {shown,hidden}.bs.dropdown events so relatedTarget gets set properly
Fixes twbs#16828 Closes twbs#16865
1 parent 9433924 commit ef1ce9a

File tree

2 files changed

+34
-2
lines changed

2 files changed

+34
-2
lines changed

js/dropdown.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
if (e.isDefaultPrevented()) return
5252

5353
$this.attr('aria-expanded', 'false')
54-
$parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
54+
$parent.removeClass('open').trigger($.Event('hidden.bs.dropdown', relatedTarget))
5555
})
5656
}
5757

@@ -85,7 +85,7 @@
8585

8686
$parent
8787
.toggleClass('open')
88-
.trigger('shown.bs.dropdown', relatedTarget)
88+
.trigger($.Event('shown.bs.dropdown', relatedTarget))
8989
}
9090

9191
return false

js/tests/unit/dropdown.js

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,38 @@ $(function () {
286286
$(document.body).trigger('click')
287287
})
288288

289+
QUnit.test('should fire shown and hidden event with a relatedTarget', function (assert) {
290+
assert.expect(2)
291+
var dropdownHTML = '<ul class="tabs">'
292+
+ '<li class="dropdown">'
293+
+ '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>'
294+
+ '<ul class="dropdown-menu">'
295+
+ '<li><a href="#">Secondary link</a></li>'
296+
+ '<li><a href="#">Something else here</a></li>'
297+
+ '<li class="divider"/>'
298+
+ '<li><a href="#">Another link</a></li>'
299+
+ '</ul>'
300+
+ '</li>'
301+
+ '</ul>'
302+
var $dropdown = $(dropdownHTML)
303+
.appendTo('#qunit-fixture')
304+
.find('[data-toggle="dropdown"]')
305+
.bootstrapDropdown()
306+
var done = assert.async()
307+
308+
$dropdown.parent('.dropdown')
309+
.on('hidden.bs.dropdown', function (e) {
310+
assert.strictEqual(e.relatedTarget, $dropdown[0])
311+
done()
312+
})
313+
.on('shown.bs.dropdown', function (e) {
314+
assert.strictEqual(e.relatedTarget, $dropdown[0])
315+
$(document.body).trigger('click')
316+
})
317+
318+
$dropdown.trigger('click')
319+
})
320+
289321
QUnit.test('should ignore keyboard events within <input>s and <textarea>s', function (assert) {
290322
assert.expect(3)
291323
var done = assert.async()

0 commit comments

Comments
 (0)