Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

avoid preventing input event onclick #30992

Merged
merged 4 commits into from Jun 10, 2020
Merged

avoid preventing input event onclick #30992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7798d7
instead of stopping event if onclick is triggered on input, call togg…
Lausselloic Jun 9, 2020
1dde132
add unit test
Lausselloic Jun 9, 2020
5f2c29c
add a dedicated test to ensure click event is forward to label
Lausselloic Jun 9, 2020
ab805b0
Merge branch 'v4-dev' into fix-label-input-onclick
XhmikosR Jun 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions js/src/button.js
View file
Open in desktop
Expand Up @@ -153,10 +153,9 @@ $(document)
return
}

if (initialButton.tagName === 'LABEL' && inputBtn && inputBtn.type === 'checkbox') {
event.preventDefault() // work around event sent to label and input
if (initialButton.tagName !== 'LABEL' || inputBtn && inputBtn.type !== 'checkbox') {
Button._jQueryInterface.call($(button), 'toggle')
}
Button._jQueryInterface.call($(button), 'toggle')
}
})
.on(EVENT_FOCUS_BLUR_DATA_API, SELECTOR_DATA_TOGGLE_CARROT, (event) => {
Expand Down
40 changes: 40 additions & 0 deletions js/tests/unit/button.js
View file
Open in desktop
Expand Up @@ -222,6 +222,46 @@ $(function () {
assert.ok(!$btn2.find('input')[0].checked, 'btn2 is not checked')
})

QUnit.test('should fire click event on input', function (assert) {
assert.expect(1)
var done = assert.async()
var groupHTML = '<div class="btn-group" data-toggle="buttons">' +
'<label class="btn btn-primary active">' +
'<input type="checkbox" id="option1"> Option 1' +
'</label>' +
'</div>'
var $group = $(groupHTML).appendTo('#qunit-fixture')

var $btn = $group.children().eq(0)
$group.find('input').on('click', function (e) {
e.preventDefault()
assert.ok(true, 'click event fired')
done()
})

$btn[0].click()
})

QUnit.test('should fire click event on label', function (assert) {
assert.expect(1)
var done = assert.async()
var groupHTML = '<div class="btn-group" data-toggle="buttons">' +
'<label class="btn btn-primary active">' +
'<input type="checkbox" id="option1"> Option 1' +
'</label>' +
'</div>'
var $group = $(groupHTML).appendTo('#qunit-fixture')

var $btn = $group.children().eq(0)
$group.find('label').on('click', function (e) {
e.preventDefault()
assert.ok(true, 'click event fired')
done()
})

$btn[0].click()
})

QUnit.test('should not add aria-pressed on labels for radio/checkbox inputs in a data-toggle="buttons" group', function (assert) {
assert.expect(2)
var groupHTML = '<div class="btn-group" data-toggle="buttons">' +
Expand Down