From d328c911cbc74e6958ee747ebf17a7481a32d831 Mon Sep 17 00:00:00 2001
From: matus <matus@ventes.io>
Date: Sat, 9 Jan 2016 16:40:51 +0800
Subject: [PATCH] Added a virtual test

---
 js/dist/scrollspy.js           |   7 ++++++-
 js/dist/scrollspy.js.map       | Bin 17156 -> 17466 bytes
 js/tests/visual/scrollspy.html |   8 +++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/js/dist/scrollspy.js b/js/dist/scrollspy.js
index 2fb9b5880..2b4845665 100644
--- a/js/dist/scrollspy.js
+++ b/js/dist/scrollspy.js
@@ -182,10 +182,14 @@ var ScrollSpy = function ($) {
       return this._scrollElement.scrollHeight || Math.max(document.body.scrollHeight, document.documentElement.scrollHeight);
     };
 
+    ScrollSpy.prototype._getOffsetHeight = function _getOffsetHeight() {
+      return this._scrollElement === window ? window.innerHeight : this._scrollElement.offsetHeight;
+    };
+
     ScrollSpy.prototype._process = function _process() {
       var scrollTop = this._getScrollTop() + this._config.offset;
       var scrollHeight = this._getScrollHeight();
-      var maxScroll = this._config.offset + scrollHeight - this._scrollElement.offsetHeight;
+      var maxScroll = this._config.offset + scrollHeight - this._getOffsetHeight();
 
       if (this._scrollHeight !== scrollHeight) {
         this.refresh();
@@ -197,6 +201,7 @@ var ScrollSpy = function ($) {
         if (this._activeTarget !== target) {
           this._activate(target);
         }
+        return;
       }
 
       if (this._activeTarget && scrollTop < this._offsets[0]) {
diff --git a/js/dist/scrollspy.js.map b/js/dist/scrollspy.js.map
index c46a3f60d88f63adafa8bc5dcfcc65b00b099584..037a05031c5caeb77657f6395d7bc11c91ebc027 100644
GIT binary patch
delta 1631
zcmZWqOK)3M5SF7ZfGACg;@YVn2?>-IpVm#2*l|)M=A8RVoQrdDq9jNN<>AM*W5<bK
z*qdw+utXa11CUs<D9Q$bgjjZo#2-NXfbQ5JftWcqi4mJ)-*dkC&V1j@-23TgfgipI
zJdfRqeOxNEa>Zh^&~gfXsoa_u^M1WvxX@2mGq<95E?rTQu(H*ZA|YXU%UK6d6)6q@
zav}?mtsCMPV2l5Er72v1Po%IxIUsU`sTyJrj7{FDN*&M`1}K0t`9z8XFw%-xO@oe;
zTjz3}9sopFg73B_<%#g1;?n(X-auozGEq|$1qDraia$;#;yO#p!USuR<2OL;(y9@Q
z3MYaxkjL#{Xsm3ZAG{w(;FrO-0~!22_||;Y5_wiY2^CH)R#0S-#?69%25Vy_1O2=2
z+$O!=5PeKrU*BD<oEmJ0wxB)GID#Pqi1>t;juac9%JPWehdQ^Gx?!tbBMqAl&7ww(
z-dDqCp?J8+;t&2Gju)YgiSp>x_#za0bdejiw4G~7*4xREqfH6z+=p6oCwD;RwQ(x^
zC{V-q!qJJ2abrst{qV!7j-oQc2Q1})?NvSeCcF^oYtL4=lFIH`B*<_?0o1wd<L}}7
zlTUaHybGHy0JDmrnP-<RiwSlWJJFZSxXGs}ZUnWYY8E$@YjX>|&!@)~U8KCrROBOJ
zeYI?opHNW@XeyFHWz2hYH6#@yO6F6O@nw?{J(CjUOS8g_0@N+O3KFKiDa$y0Q=yM9
zXA*nEefK7V#(-a|7-aBN5{fcd(gI5VW{~AP`Z|L%V^wEBJx>{=j6OE*ElxH~W+e{V
zOUNWXzc*tgEbeb=K%3GsRwW~n?1s%_QT9e_SoK<x9CG2*qavP5sCq{%W;=tEk+sXN
zMI#4`16z#rwP-eiVNBQ<61Ito=cU6;$I$bNR6rW|zE=<_NzdjI&vf6j$k3j*%ki0!
z=^vCp&(5xH%XPpPk;!<);R0xPI1)VHVW)KO9A@y3$Vc&%KIM^xJ*M3O;gbV7#%-Kp
zBbrJ7C&=a!9WlHuS8Yahq?W_^)60W~VuM}FrSZ4uLXhbB^_14Hq%EFmU#2h|6SEn;
zMJl+t1`O;91r#^{k7EmgMf^P09xLVX@0j~a&DH~3$9x<DZTu>}_P8<7S993vy@oF3
zKG)OYMOOpLHaiKsB?teC?~PR){Ao6Xwb}7IB}bpsb+<#(rh~}sbIrBSBi550{BHI^
zwCQle4!4H(f~u>IBV7D>Hi)myMcy5fRR(5IxMQ#*S>QIzl^y=s9$2Ixx#M%LiJfAP
zI3Rg-H22H&tJhxvyj&JIwLCN3_3I~R-N!c{gVx*{j;9vz&6St0U&99<jRy~}MCy$I
N{+f<l?WeyT{|8Q1(<1-?

delta 1342
zcmY*Z&u<%55Y|?$RFt+sQDS=&+p(}{3VFqG{JWuud2fF>a$I}cSdKvmCBd<G)!0cK
zrzAr3f)E!fm64F(!i5_MA-O013XU8&fW*E01;EU+q2}^-_q}gszWKg+`_pH}C!ZQW
z#x9TEx*U0VHc-NY+}1#fp@i%f{xKh1_myY?v_%D=(#3ZdR#ys2>;r5G1<;pkl8&7Z
z<;DiUCWr>D8X8Fac0n%I!~=jp3L79R38K=Bhib|GB6QQp<4S17$YCw?YOLchRA+5>
z9Z>~1V7$ePgI|UYFBKJD3BP_Lu!!UsxKCSm!)c?7{cv=?V=<)<csY||6I563;5Xq=
z(*N(ka*3RMFlIQF$H!m7@yH%iYw5#NR$@}b#~YE&W@&0?s?rom&6J{3_l~t30OFAZ
zzji9QwV+0_4*2^W-Cj^@kt#m^5V>vm_-iD3{lt2qzyPn9ug#q(;R4*}j#@0O8sgh#
za_LOVlVc^7J9LPtRTgbf$MOt6HgC>8;w|ucF3WCraAdw|9O0j4{ITz_byZi?0Pb<x
z{gll`A5=MlRHFc2t=Xg=&@d2SpolFaJgNXG#fXl5ZZp1XGveGPK18ljVbgjJ%K&*>
z7pgE!7iu#IKVQ7noE%kOaCkVbpy`e|tV==>hm7P3oqsu0n8}6a(6_Rh!;$tjZ=K<_
zrSxpy=B$*1qE=-Ax0XyN@9;E3yXz7&t0)<fQuOXxWLCO9ZC18^DoLX%<m%+sF<pZC
z9`{qv;de`S9uFMR1W1pCu`*L_cWs7o!qOz6@15!?2t3NP4~O0XIn|NS^V%XW>D#`r
zsZh^zNYX>E!SN+2b^&U70>>uk`_RyHxdFF9ksvgqn~IxgrN#!cP@Dw3RhQrOyzJ)i
zY4kl~9iK;|bU&`eN{jzHb=jFcjvC4=z8{Mk8T=@gTv)et^$c^P`KQH~>-a1t=$if>
z3tgpinuAIP|BfYTsFLyFrM3I`b-a4jcbWWdfY0M#9AkR<&KnQQT)_6rEL-zP+p@#n
zIJ{_Op`=xTM$yHumYeuW!o-&nGjm0k#eyCirJz8K;nT#z9Hna>>U2ANHO}P;Rui|(
zewin5vNcf)R8O7YlSJn3Bv+t+Ko-T7E&g3qfXAs;a`{oG4V!1_V%uk)=i3LvGPQp(
d`YZACJnrUy!$Lkf+Ab^`XqIM1Pm15q`~$w{caQ)8

diff --git a/js/tests/visual/scrollspy.html b/js/tests/visual/scrollspy.html
index 4c4b6ae45..337611126 100644
--- a/js/tests/visual/scrollspy.html
+++ b/js/tests/visual/scrollspy.html
@@ -13,7 +13,7 @@
   <body data-spy="scroll" data-target=".navbar" data-offset="70">
     <div class="container">
       <nav class="navbar navbar-fixed-top navbar-dark bg-inverse">
-        <a class="navbar-brand" href="#">Navbar</a>
+        <a class="navbar-brand" href="#">Scrollspy test</a>
         <ul class="nav navbar-nav">
           <li class="nav-item">
             <a class="nav-link" href="#fat">@fat</a>
@@ -30,6 +30,9 @@
               <a class="dropdown-item" href="#three">three</a>
             </div>
           </li>
+          <li class="nav-item">
+            <a class="nav-link" href="#final">Final</a>
+          </li>
         </ul>
       </nav>
 
@@ -76,6 +79,9 @@
       <p>Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.</p>
       <p>Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.</p>
       <p>Ad leggings keytar, brunch id art party dolor labore. Pitchfork yr enim lo-fi before they sold out qui. Tumblr farm-to-table bicycle rights whatever. Anim keffiyeh carles cardigan. Velit seitan mcsweeney's photo booth 3 wolf moon irure. Cosby sweater lomo jean shorts, williamsburg hoodie minim qui you probably haven't heard of them et cardigan trust fund culpa biodiesel wes anderson aesthetic. Nihil tattooed accusamus, cred irony biodiesel keffiyeh artisan ullamco consequat.</p>
+      <hr>
+      <h2 id="final">Final section</h2>
+      <p>Ad leggings keytar, brunch id art party dolor labore.</p>
     </div>
 
     <script src="../vendor/jquery.min.js"></script>