mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-12 08:34:08 +02:00
Code Issues Releases Wiki Activity

feat(dropdown): add original click event

Browse Source
This commit is contained in:
jakubhonisek
2018-06-25 15:29:34 +02:00
committed by Johann-S
parent bca4ceacc7
commit 49e094619b
3 changed files with 73 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/dropdown.js
View File

@@ -344,6 +344,10 @@ const Dropdown = (($) => {
relatedTarget: toggles[i]
}
if (event && event.type === 'click') {
relatedTarget.clickEvent = event
}
if (!context) {
continue
}

68
js/tests/unit/dropdown.js
View File

@@ -499,6 +499,74 @@ $(function () {
$dropdown.trigger('click')
})
QUnit.test('should fire hide and hidden event with a clickEvent', function (assert) {
assert.expect(3)
var dropdownHTML = '<div class="tabs">' +
'<div class="dropdown">' +
'<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' +
'<div class="dropdown-menu">' +
'<a class="dropdown-item" href="#">Secondary link</a>' +
'<a class="dropdown-item" href="#">Something else here</a>' +
'<div class="divider"/>' +
'<a class="dropdown-item" href="#">Another link</a>' +
'</div>' +
'</div>' +
'</div>'
var $dropdown = $(dropdownHTML)
.appendTo('#qunit-fixture')
.find('[data-toggle="dropdown"]')
.bootstrapDropdown()
$dropdown.parent('.dropdown')
.on('hide.bs.dropdown', function (e) {
assert.ok(e.clickEvent)
})
.on('hidden.bs.dropdown', function (e) {
assert.ok(e.clickEvent)
})
.on('shown.bs.dropdown', function () {
assert.ok(true, 'shown was fired')
$(document.body).trigger('click')
})
$dropdown.trigger('click')
})
QUnit.test('should fire hide and hidden event without a clickEvent if event type is not click', function (assert) {
assert.expect(3)
var dropdownHTML = '<div class="tabs">' +
'<div class="dropdown">' +
'<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' +
'<div class="dropdown-menu">' +
'<a class="dropdown-item" href="#">Secondary link</a>' +
'<a class="dropdown-item" href="#">Something else here</a>' +
'<div class="divider"/>' +
'<a class="dropdown-item" href="#">Another link</a>' +
'</div>' +
'</div>' +
'</div>'
var $dropdown = $(dropdownHTML)
.appendTo('#qunit-fixture')
.find('[data-toggle="dropdown"]')
.bootstrapDropdown()
$dropdown.parent('.dropdown')
.on('hide.bs.dropdown', function (e) {
assert.notOk(e.clickEvent)
})
.on('hidden.bs.dropdown', function (e) {
assert.notOk(e.clickEvent)
})
.on('shown.bs.dropdown', function () {
assert.ok(true, 'shown was fired')
$dropdown.trigger($.Event('keydown', {
which: 27
}))
})
$dropdown.trigger('click')
})
QUnit.test('should ignore keyboard events within <input>s and <textarea>s', function (assert) {
assert.expect(3)
var done = assert.async()