diff options
| author | Johann-S <[email protected]> | 2017-08-29 21:32:52 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-08-29 21:32:52 +0200 |
| commit | 0b06ad69d2c3428b052ca228c0b12b45ab36ec55 (patch) | |
| tree | cfce8034c7a9a8819fe625867415c1c9e5f08586 /js/src | |
| parent | 0fdbaaf8853b266f75777cf84295b1bfdedd8a8a (diff) | |
| parent | 1ea63d131279884ab3729111f22b455205eed6e7 (diff) | |
| download | bootstrap-0b06ad69d2c3428b052ca228c0b12b45ab36ec55.tar.xz bootstrap-0b06ad69d2c3428b052ca228c0b12b45ab36ec55.zip | |
Merge branch 'v4-dev' into patch-5
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/modal.js | 12 | ||||
| -rw-r--r-- | js/src/util.js | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/js/src/modal.js b/js/src/modal.js index d21a137fb..ab73230c8 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -68,6 +68,7 @@ const Modal = (($) => { DATA_TOGGLE : '[data-toggle="modal"]', DATA_DISMISS : '[data-dismiss="modal"]', FIXED_CONTENT : '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top', + STICKY_CONTENT : '.sticky-top', NAVBAR_TOGGLER : '.navbar-toggler' } @@ -441,6 +442,13 @@ const Modal = (($) => { $(element).data('padding-right', actualPadding).css('padding-right', `${parseFloat(calculatedPadding) + this._scrollbarWidth}px`) }) + // Adjust sticky content margin + $(Selector.STICKY_CONTENT).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) => { const actualMargin = $(element)[0].style.marginRight @@ -464,8 +472,8 @@ const Modal = (($) => { } }) - // Restore navbar-toggler margin - $(Selector.NAVBAR_TOGGLER).each((index, element) => { + // Restore sticky content and navbar-toggler margin + $(`${Selector.STICKY_CONTENT}, ${Selector.NAVBAR_TOGGLER}`).each((index, element) => { const margin = $(element).data('margin-right') if (typeof margin !== 'undefined') { $(element).css('margin-right', margin).removeData('margin-right') diff --git a/js/src/util.js b/js/src/util.js index 69fb8283c..cd3f1fb6a 100644 --- a/js/src/util.js +++ b/js/src/util.js @@ -117,7 +117,7 @@ const Util = (($) => { } try { - const $selector = $(selector) + const $selector = $(document).find(selector) return $selector.length > 0 ? selector : null } catch (error) { return null |