diff options
| author | Johann-S <[email protected]> | 2018-04-30 16:37:45 +0200 |
|---|---|---|
| committer | Johann-S <[email protected]> | 2018-06-01 10:30:11 +0200 |
| commit | b1eb3fccfa722afc4f7ca0d00eb848353ce8aed8 (patch) | |
| tree | 638af933a31acaabdedacf9a99a66e94662e6ae5 /js/src/modal.js | |
| parent | 62cc0fda50781606da5989b5a6eba6770bc34a51 (diff) | |
| download | bootstrap-b1eb3fccfa722afc4f7ca0d00eb848353ce8aed8.tar.xz bootstrap-b1eb3fccfa722afc4f7ca0d00eb848353ce8aed8.zip | |
refactor(plugins): improve how we query elements
Diffstat (limited to 'js/src/modal.js')
| -rw-r--r-- | js/src/modal.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/js/src/modal.js b/js/src/modal.js index e8580eb0d..b091a79b5 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -430,23 +430,26 @@ const Modal = (($) => { if (this._isBodyOverflowing) { // Note: DOMNode.style.paddingRight returns the actual value or '' if not set // while $(DOMNode).css('padding-right') returns the calculated value or 0 if not set + const fixedContent = [].slice.call(document.querySelectorAll(Selector.FIXED_CONTENT)) + const stickyContent = [].slice.call(document.querySelectorAll(Selector.STICKY_CONTENT)) + const navbarToggler = [].slice.call(document.querySelectorAll(Selector.NAVBAR_TOGGLER)) // Adjust fixed content padding - $(Selector.FIXED_CONTENT).each((index, element) => { + $(fixedContent).each((index, element) => { const actualPadding = $(element)[0].style.paddingRight const calculatedPadding = $(element).css('padding-right') $(element).data('padding-right', actualPadding).css('padding-right', `${parseFloat(calculatedPadding) + this._scrollbarWidth}px`) }) // Adjust sticky content margin - $(Selector.STICKY_CONTENT).each((index, element) => { + $(stickyContent).each((index, element) => { const actualMargin = $(element)[0].style.marginRight const calculatedMargin = $(element).css('margin-right') $(element).data('margin-right', actualMargin).css('margin-right', `${parseFloat(calculatedMargin) - this._scrollbarWidth}px`) }) // Adjust navbar-toggler margin - $(Selector.NAVBAR_TOGGLER).each((index, element) => { + $(navbarToggler).each((index, element) => { const actualMargin = $(element)[0].style.marginRight const calculatedMargin = $(element).css('margin-right') $(element).data('margin-right', actualMargin).css('margin-right', `${parseFloat(calculatedMargin) + this._scrollbarWidth}px`) @@ -461,7 +464,8 @@ const Modal = (($) => { _resetScrollbar() { // Restore fixed content padding - $(Selector.FIXED_CONTENT).each((index, element) => { + const fixedContent = [].slice.call(document.querySelectorAll(Selector.FIXED_CONTENT)) + $(fixedContent).each((index, element) => { const padding = $(element).data('padding-right') if (typeof padding !== 'undefined') { $(element).css('padding-right', padding).removeData('padding-right') |