mirror of
https://github.com/twbs/bootstrap.git
synced 2025-03-13 13:29:25 +01:00
fix: change dismiss handler, listening to key down, instead of click (#36401)
This commit is contained in:
parent
a877c5d04a
commit
d05c42a397
@ -30,7 +30,7 @@ const EVENT_HIDDEN = `hidden${EVENT_KEY}`
|
||||
const EVENT_SHOW = `show${EVENT_KEY}`
|
||||
const EVENT_SHOWN = `shown${EVENT_KEY}`
|
||||
const EVENT_RESIZE = `resize${EVENT_KEY}`
|
||||
const EVENT_CLICK_DISMISS = `click.dismiss${EVENT_KEY}`
|
||||
const EVENT_MOUSEDOWN_DISMISS = `mousedown.dismiss${EVENT_KEY}`
|
||||
const EVENT_KEYDOWN_DISMISS = `keydown.dismiss${EVENT_KEY}`
|
||||
const EVENT_CLICK_DATA_API = `click${EVENT_KEY}${DATA_API_KEY}`
|
||||
|
||||
@ -221,7 +221,7 @@ class Modal extends BaseComponent {
|
||||
}
|
||||
})
|
||||
|
||||
EventHandler.on(this._element, EVENT_CLICK_DISMISS, event => {
|
||||
EventHandler.on(this._element, EVENT_MOUSEDOWN_DISMISS, event => {
|
||||
if (event.target !== event.currentTarget) { // click is inside modal-dialog
|
||||
return
|
||||
}
|
||||
|
@ -641,9 +641,10 @@ describe('Modal', () => {
|
||||
|
||||
modalEl.addEventListener('shown.bs.modal', () => {
|
||||
const spy = spyOn(modal, '_queueCallback').and.callThrough()
|
||||
const mouseDown = createEvent('mousedown')
|
||||
|
||||
modalEl.click()
|
||||
modalEl.click()
|
||||
modalEl.dispatchEvent(mouseDown)
|
||||
modalEl.dispatchEvent(mouseDown)
|
||||
|
||||
setTimeout(() => {
|
||||
expect(spy).toHaveBeenCalledTimes(1)
|
||||
@ -709,13 +710,19 @@ describe('Modal', () => {
|
||||
fixtureEl.innerHTML = '<div class="modal"><div class="modal-dialog"></div></div>'
|
||||
|
||||
const modalEl = fixtureEl.querySelector('.modal')
|
||||
const dialogEl = modalEl.querySelector('.modal-dialog')
|
||||
const modal = new Modal(modalEl)
|
||||
modalEl.addEventListener('shown.bs.modal', () => {
|
||||
modalEl.click()
|
||||
})
|
||||
|
||||
modalEl.addEventListener('hidden.bs.modal', () => {
|
||||
expect(document.querySelector('.modal-backdrop')).toBeNull()
|
||||
spyOn(modal, 'hide')
|
||||
|
||||
modalEl.addEventListener('shown.bs.modal', () => {
|
||||
const mouseDown = createEvent('mousedown')
|
||||
|
||||
dialogEl.dispatchEvent(mouseDown)
|
||||
expect(modal.hide).not.toHaveBeenCalled()
|
||||
|
||||
modalEl.dispatchEvent(mouseDown)
|
||||
expect(modal.hide).toHaveBeenCalled()
|
||||
resolve()
|
||||
})
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user