From ae50bb784506b4aa6b79598c2000c1d20843b5fd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 18 Mar 2017 18:47:57 -0700 Subject: [PATCH] grunt --- js/dist/modal.js | 2 +- js/dist/modal.js.map | Bin 29182 -> 29232 bytes js/dist/scrollspy.js | 11 +++++++---- js/dist/scrollspy.js.map | Bin 17544 -> 17747 bytes 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/js/dist/modal.js b/js/dist/modal.js index 73d203eda..8138f1949 100644 --- a/js/dist/modal.js +++ b/js/dist/modal.js @@ -436,7 +436,7 @@ var Modal = function ($) { var scrollDiv = document.createElement('div'); scrollDiv.className = ClassName.SCROLLBAR_MEASURER; document.body.appendChild(scrollDiv); - var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth; + var scrollbarWidth = scrollDiv.getBoundingClientRect().width - scrollDiv.clientWidth; document.body.removeChild(scrollDiv); return scrollbarWidth; }; diff --git a/js/dist/modal.js.map b/js/dist/modal.js.map index d4b739b0d94ad18df79de2cfba66cabdcd0a0038..9a34bd6a323966c22e499a34ae255c73ff82ab52 100644 GIT binary patch delta 598 zcmZuv!EVz)5Yc(;9Vc}{D$>#>hYC>~D+zI8Cyj|} zJ_6``0yhq*QhtF0A5jURg2a(8KzLSgKycZe*_nBI@6G-^XQyA;>C)U{$D4>C8n%1G zj^+2f;bg~iCmEiZ&N6c+cdH`-u+J+1eaqrC0N*)q?1PqN>59H-<#Fo=AX1q!b%G^!7 zi1FNbqvWN1uua&JXplWG1to^?@pWO4{@suhaw8gEGLePq&p<>aWZX}65OyW4wEbBiq_HWi+QH~|F^8(Tbs^4cJE*O E1(}$#^#A|> delta 549 zcmZWnO-~b16wM2m4hv~F4PO(2p$3w^WM(=af`Z9??X(QF#0vdbbW>`vP&?Ct*r6nZ zg$tL48^X^J)1Sc3g};EEF8l?q4EWxQm>4$i-Fx4?C+D2|E`N}l@8ohO5(##84w~;O zLo0H&uu=gi(;PsbWoZeZv_W}gka-4>hUE-x0&J$K2e3uc0F47zJiivP&ekxdEyZ&5 z4THCh3UwH?8-+crYDp5{2kp_U=}{NJ72{bE6;qywUy1R0h*w&Tq;O7;6CWKNNC!h* zB{rVx%hUgLdb9|zEf5Y_AAj;DA0HU=@lKBB0rGy1764v|W0wWEYRr-@){KP0-#P!h zj~|WainS&ad-%;rl4u}>RJvJ-&_l(vqFqWqy9QA;BR{pzc`ab$FGh$V|YU1 eOFr#pIBvJa>ih~?tlArrC)dWm@9?YjbnFkxqoHd6 diff --git a/js/dist/scrollspy.js b/js/dist/scrollspy.js index 52cf3de3b..10fc3c394 100644 --- a/js/dist/scrollspy.js +++ b/js/dist/scrollspy.js @@ -126,9 +126,12 @@ var ScrollSpy = function ($) { target = $(targetSelector)[0]; } - if (target && (target.offsetWidth || target.offsetHeight)) { - // todo (fat): remove sketch reliance on jQuery position/offset - return [$(target)[offsetMethod]().top + offsetBase, targetSelector]; + if (target) { + var targetBCR = target.getBoundingClientRect(); + if (targetBCR.width || targetBCR.height) { + // todo (fat): remove sketch reliance on jQuery position/offset + return [$(target)[offsetMethod]().top + offsetBase, targetSelector]; + } } return null; }).filter(function (item) { @@ -183,7 +186,7 @@ var ScrollSpy = function ($) { }; ScrollSpy.prototype._getOffsetHeight = function _getOffsetHeight() { - return this._scrollElement === window ? window.innerHeight : this._scrollElement.offsetHeight; + return this._scrollElement === window ? window.innerHeight : this._scrollElement.getBoundingClientRect().height; }; ScrollSpy.prototype._process = function _process() { diff --git a/js/dist/scrollspy.js.map b/js/dist/scrollspy.js.map index d02dc89931b9c1e917f4cc55aff3506924a66ecb..132a267187e6d6097d7838d85d1e49e4ed27973a 100644 GIT binary patch delta 2564 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 L`_n2Mv^)L>uClKc