mirror/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-21 03:41:03 +00:00
Code Issues Projects Releases Wiki Activity

Modal: refactor listeners to reduce some code noise (#35902)

Browse Source
This commit is contained in:
GeoSot 2022-03-01 17:08:12 +02:00 committed by GitHub
parent c644f09d88
commit 63f30ac8ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
js/src/modal.js
View File

@ -69,6 +69,8 @@ class Modal extends BaseComponent {
this._isShown = false
this._isTransitioning = false
this._scrollBar = new ScrollBarHelper()
this._addEventListeners()
}
// Getters
@ -111,9 +113,6 @@ class Modal extends BaseComponent {
this._adjustDialog()
this._toggleEscapeEventListener(true)
this._toggleResizeEventListener(true)
this._backdrop.show(() => this._showElement(relatedTarget))
}
@ -130,10 +129,6 @@ class Modal extends BaseComponent {
this._isShown = false
this._isTransitioning = true
this._toggleEscapeEventListener(false)
this._toggleResizeEventListener(false)
this._focustrap.deactivate()
this._element.classList.remove(CLASS_NAME_SHOW)
@ -217,12 +212,7 @@ class Modal extends BaseComponent {
this._queueCallback(transitionComplete, this._dialog, this._isAnimated())
}
_toggleEscapeEventListener(enable) {
if (!enable) {
EventHandler.off(this._element, EVENT_KEYDOWN_DISMISS)
return
}
_addEventListeners() {
EventHandler.on(this._element, EVENT_KEYDOWN_DISMISS, event => {
if (event.key !== ESCAPE_KEY) {
return
@ -236,15 +226,12 @@ class Modal extends BaseComponent {
this._triggerBackdropTransition()
})
}
_toggleResizeEventListener(enable) {
if (enable) {
EventHandler.on(window, EVENT_RESIZE, () => this._adjustDialog())
return
}
EventHandler.off(window, EVENT_RESIZE)
EventHandler.on(window, EVENT_RESIZE, () => {
if (this._isShown && !this._isTransitioning) {
this._adjustDialog()
}
})
}
_hideModal() {

4
js/tests/unit/modal.spec.js
View File

@ -438,10 +438,10 @@ describe('Modal', () => {
const modalEl = fixtureEl.querySelector('.modal')
const modal = new Modal(modalEl)
spyOn(modal, '_adjustDialog').and.callThrough()
const spy = spyOn(modal, '_adjustDialog').and.callThrough()
const expectDone = () => {
expect(modal._adjustDialog).toHaveBeenCalled()
expect(spy).toHaveBeenCalled()
resolve()
}