aboutsummaryrefslogtreecommitdiff
path: root/js/src/modal/modal.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/src/modal/modal.js')
-rw-r--r--js/src/modal/modal.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/js/src/modal/modal.js b/js/src/modal/modal.js
index a0e460f22..5d7424937 100644
--- a/js/src/modal/modal.js
+++ b/js/src/modal/modal.js
@@ -243,6 +243,7 @@ class Modal {
_showElement(relatedTarget) {
const transition = this._element.classList.contains(ClassName.FADE)
+ const modalBody = SelectorEngine.findOne(Selector.MODAL_BODY, this._dialog)
if (!this._element.parentNode ||
this._element.parentNode.nodeType !== Node.ELEMENT_NODE) {
@@ -254,8 +255,8 @@ class Modal {
this._element.removeAttribute('aria-hidden')
this._element.setAttribute('aria-modal', true)
- if (this._dialog.classList.contains(ClassName.SCROLLABLE)) {
- SelectorEngine.findOne(Selector.MODAL_BODY, this._dialog).scrollTop = 0
+ if (this._dialog.classList.contains(ClassName.SCROLLABLE) && modalBody) {
+ modalBody.scrollTop = 0
} else {
this._element.scrollTop = 0
}