diff options
| author | Jacob Thornton <[email protected]> | 2015-08-15 12:10:24 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2015-08-15 12:10:24 -0700 |
| commit | c830956d17d23acf5f5a177db5509bd87f1473c3 (patch) | |
| tree | 491e9ecd85f0f979e30188392bb9bf62fe4610ae /js/src | |
| parent | db14bac42fcac97df5e1b11ab14f8907a3c3c2a9 (diff) | |
| download | bootstrap-c830956d17d23acf5f5a177db5509bd87f1473c3.tar.xz bootstrap-c830956d17d23acf5f5a177db5509bd87f1473c3.zip | |
change modal.js to use is-fixed classes to target padding-right
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/modal.js | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/js/src/modal.js b/js/src/modal.js index 287acb12d..df49c1a4c 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -55,17 +55,18 @@ const Modal = (($) => { } const ClassName = { - BACKDROP : 'modal-backdrop', - OPEN : 'modal-open', - FADE : 'fade', - IN : 'in' + SCROLLBAR_MEASURER : 'modal-scrollbar-measure', + BACKDROP : 'modal-backdrop', + OPEN : 'modal-open', + FADE : 'fade', + IN : 'in' } const Selector = { DIALOG : '.modal-dialog', DATA_TOGGLE : '[data-toggle="modal"]', DATA_DISMISS : '[data-dismiss="modal"]', - SCROLLBAR_MEASURER : 'modal-scrollbar-measure' + FIXED_CONTENT : '.navbar-fixed-top, .navbar-fixed-bottom, .is-fixed' } @@ -414,7 +415,7 @@ const Modal = (($) => { _setScrollbar() { let bodyPadding = parseInt( - $(document.body).css('padding-right') || 0, + $(Selector.FIXED_CONTENT).css('padding-right') || 0, 10 ) @@ -432,7 +433,7 @@ const Modal = (($) => { _getScrollbarWidth() { // thx d.walsh let scrollDiv = document.createElement('div') - scrollDiv.className = Selector.SCROLLBAR_MEASURER + scrollDiv.className = ClassName.SCROLLBAR_MEASURER document.body.appendChild(scrollDiv) let scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth document.body.removeChild(scrollDiv) |