diff options
| author | Shohei Yoshida <fellows3@gmail.com> | 2019-01-21 00:28:16 +0300 |
|---|---|---|
| committer | XhmikosR <xhmikosr@gmail.com> | 2019-01-21 00:28:16 +0300 |
| commit | de0bb1e0522d14bcdef70746da277992f992f83c (patch) | |
| tree | b48397d9cd7f0e1f695a9b7beb56abf728e65bf8 /js/src | |
| parent | 41f85b64bf6dd7aae13c1b9e5ca6ed310bfa1bbf (diff) | |
Scrollable modal (#27769)
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/modal.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/js/src/modal.js b/js/src/modal.js index 125182e136..f658201306 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -51,6 +51,7 @@ const Event = { } const ClassName = { + SCROLLABLE : 'modal-dialog-scrollable', SCROLLBAR_MEASURER : 'modal-scrollbar-measure', BACKDROP : 'modal-backdrop', OPEN : 'modal-open', @@ -60,6 +61,7 @@ const ClassName = { const Selector = { DIALOG : '.modal-dialog', + MODAL_BODY : '.modal-body', DATA_TOGGLE : '[data-toggle="modal"]', DATA_DISMISS : '[data-dismiss="modal"]', FIXED_CONTENT : '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top', @@ -244,7 +246,12 @@ class Modal { this._element.style.display = 'block' this._element.removeAttribute('aria-hidden') this._element.setAttribute('aria-modal', true) - this._element.scrollTop = 0 + + if ($(this._dialog).hasClass(ClassName.SCROLLABLE)) { + this._dialog.querySelector(Selector.MODAL_BODY).scrollTop = 0 + } else { + this._element.scrollTop = 0 + } if (transition) { Util.reflow(this._element) |