From 1166cc6f5f3e765701f1ec2ee1afeb8c8bca024d Mon Sep 17 00:00:00 2001 From: Gaetan Renaudeau Date: Fri, 29 Jul 2011 23:38:58 +0200 Subject: [PATCH] Add 10px for scrollTop --- demo/flexible-nav.min.js | 2 +- demo/index.html | 2 +- dist/flexible-nav-1.0.zip | Bin 1652 -> 1655 bytes flexible-nav.js | 2 +- lib/flexible-nav.min.js | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demo/flexible-nav.min.js b/demo/flexible-nav.min.js index 17f0f6b..91b3888 100644 --- a/demo/flexible-nav.min.js +++ b/demo/flexible-nav.min.js @@ -1,4 +1,4 @@ /*! * Flexible Nav - 2011 - by @greweb */ -(function(e){var b=0;var c=function(){return ++b};var a=function(f){var h=e('');var g=e.map(f,function(i){return e('
  • '+i.text+"
    • ")[0]});h.find("ul").append(g);return h};var d=function(g){var f=e(g).attr("href");if(f.substring(0,1)=="#"){var h=e(f);return h.size()?h:null}return null};window.FlexibleNavMaker=function(f){var g=this;g.nodes=e(f||"h1,h2,h3");g.make=function(){var h=g.nodes.map(function(){var i=e(this);var k=i.attr("id");if(!k){while(!k){k="n"+(c());if(e("#"+k).size()>0){k=null}}i.attr("id",k)}var j=i.attr("data-navtext")||i.text();return{href:"#"+k,text:j}});return a(h)}};window.FlexibleNav=function(g){var f=this;f.nav=e(g);f.updateClasses=function(){f.nav.find("a").each(function(){var h=e(this);var i=d(h);if(i){h.addClass("tnn-"+i[0].nodeName.toLowerCase())}})};f.update=function(){var k=e(document).height();var l=e(window).height();var h=f.nav.find("a").map(function(){var m=e(this);var n=d(m);if(n==null||!n.is(":visible")){return null}return{top:n.offset().top,node:m}});e.each(h,function(m,n){n.node.css("top",(100*n.top/k)+"%")});var j=e(document).scrollTop();var i=null;e.each(h,function(m,n){n.node.removeClass("current");if(i==null||(n.top<=j&&n.top>i.top)){i=n}});i&&i.node.addClass("current")};e(window).scroll(function(){f.update()});f.updateClasses();f.update()}}(jQuery)); \ No newline at end of file +(function(e){var b=0;var c=function(){return ++b};var a=function(f){var h=e('');var g=e.map(f,function(i){return e('
  • '+i.text+"
    • ")[0]});h.find("ul").append(g);return h};var d=function(g){var f=e(g).attr("href");if(f.substring(0,1)=="#"){var h=e(f);return h.size()?h:null}return null};window.FlexibleNavMaker=function(f){var g=this;g.nodes=e(f||"h1,h2,h3");g.make=function(){var h=g.nodes.map(function(){var i=e(this);var k=i.attr("id");if(!k){while(!k){k="n"+(c());if(e("#"+k).size()>0){k=null}}i.attr("id",k)}var j=i.attr("data-navtext")||i.text();return{href:"#"+k,text:j}});return a(h)}};window.FlexibleNav=function(g){var f=this;f.nav=e(g);f.updateClasses=function(){f.nav.find("a").each(function(){var h=e(this);var i=d(h);if(i){h.addClass("tnn-"+i[0].nodeName.toLowerCase())}})};f.update=function(){var k=e(document).height();var l=e(window).height();var h=f.nav.find("a").map(function(){var m=e(this);var n=d(m);if(n==null||!n.is(":visible")){return null}return{top:n.offset().top,node:m}});e.each(h,function(m,n){n.node.css("top",(100*n.top/k)+"%")});var j=e(document).scrollTop();var i=null;e.each(h,function(m,n){n.node.removeClass("current");if(i==null||(n.top<=j+10&&n.top>i.top)){i=n}});i&&i.node.addClass("current")};e(window).scroll(function(){f.update()});f.updateClasses();f.update()}}(jQuery)); \ No newline at end of file diff --git a/demo/index.html b/demo/index.html index e7e25e4..8412712 100644 --- a/demo/index.html +++ b/demo/index.html @@ -171,7 +171,7 @@

    Flexibility only

    var closest = null; $.each(links, function(i, link){ link.node.removeClass('current'); - if(closest==null || (link.top <= scrollTop && link.top > closest.top)) + if(closest==null || (link.top <= scrollTop+10 && link.top > closest.top)) closest = link; }); closest && closest.node.addClass('current'); diff --git a/dist/flexible-nav-1.0.zip b/dist/flexible-nav-1.0.zip index 912ee49aae3ffc29d8ab50ca8d1fc3398f259b32..f375938965baf5a75b4a4b3355eb611a0ab03118 100644 GIT binary patch delta 966 zcmeyu^PPt$z?+$civa{~?wQD=p`4{*><7Z772FJrEH9WD7{CNbnFvr32S{1CjVM-S z8&`BO^4{F@*KTF}|E%>)3=C5z+cO!|V^zz*&>DQYZ?=KR-SgoF>t@|xemvo&UdxtC z9rUCHi-Fs=kty@n>+U{`OjUSv;S1?xw+!o z%H`&&*Y9k({_X6~N!R`y*uEjXuzj+h>slSrXHRydZ{5sW|JPyv;(|33lF!~=7uNSW zuR1s-*l^=a@!oSHHSLQ51rgN z^VsR9X=h~uKdZPDhX?H~dY-ZPx^8`L?3Or#11+^3e?HZJR}nCosC8_`X~BhSR$0_6 zQIT+HeJbz&C-}5I<3G)MnT*>~%6Hi&I;dGJ^xd9&D{7UD{F1YqVXG*h+WOUBOQdUyJE4pN+7B;yZo43hHF7DUA=1cA3l7$!DU8=mZ%a`u!d}VaLewwIV z^}3mnf0lcn?JhdsZm?+GI>u9cn{Bj@F8gYAXQy|)nX$a|%J~YCRT-*9W|PJ8y~CvxqZO9kMG=%zc%0DSI-#W&B!Fj49hQ*9azm2v1S&KDp+=z jJe}1`hoCCtOvB4&r-@YqD;p@IG6SIwBLjmeD~JaG!W@}5 delta 963 zcmey)^M!{ez?+$civa|t@0iG=p`52+><7Z772FJrEMFNJ7+6Grk|1RunggUP+(s0u zvW+Xc7;WLjul!y z)$P?P*_A=%q2hcJZy4Aj2f3`^UgigbKTUr@cv)He+$p$O5pDNy>)WzLhX3iFwMa&o9X z2-DJQE_C_DeD3t?MNA^huXy}tzEWLvf^(1m$&U)5YHzesJ(T6!XWUqHpnkzMf6w)~ z#^%;*mb_z9_wYr|^7 zy$m{-Yb$5>x~i8m$hvDZTHkd|D%66X~nS`&{+1)o~*q~*Sd z%I>HC{jU5Jt>yhv>>Y1B`{v7%^(&eFo!+~ucXN$;?}N#9dzSrOev9Q-4{l>C*WfIpxQj zorz(e=Ic#8(Y^P@VUF9Ym^94Kyjml2`&#z4**4`%?5lRFv3Db%$K5QS zgMvrGo1Y{db-Q@>z{8LHQ>^#=zS#AO_uZxV0B=SnIc8X9ne5DJrieACfK closest.top)) + if(closest==null || (link.top <= scrollTop+10 && link.top > closest.top)) closest = link; }); closest && closest.node.addClass('current'); diff --git a/lib/flexible-nav.min.js b/lib/flexible-nav.min.js index 17f0f6b..91b3888 100644 --- a/lib/flexible-nav.min.js +++ b/lib/flexible-nav.min.js @@ -1,4 +1,4 @@ /*! * Flexible Nav - 2011 - by @greweb */ -(function(e){var b=0;var c=function(){return ++b};var a=function(f){var h=e('');var g=e.map(f,function(i){return e('
  • '+i.text+"
    • ")[0]});h.find("ul").append(g);return h};var d=function(g){var f=e(g).attr("href");if(f.substring(0,1)=="#"){var h=e(f);return h.size()?h:null}return null};window.FlexibleNavMaker=function(f){var g=this;g.nodes=e(f||"h1,h2,h3");g.make=function(){var h=g.nodes.map(function(){var i=e(this);var k=i.attr("id");if(!k){while(!k){k="n"+(c());if(e("#"+k).size()>0){k=null}}i.attr("id",k)}var j=i.attr("data-navtext")||i.text();return{href:"#"+k,text:j}});return a(h)}};window.FlexibleNav=function(g){var f=this;f.nav=e(g);f.updateClasses=function(){f.nav.find("a").each(function(){var h=e(this);var i=d(h);if(i){h.addClass("tnn-"+i[0].nodeName.toLowerCase())}})};f.update=function(){var k=e(document).height();var l=e(window).height();var h=f.nav.find("a").map(function(){var m=e(this);var n=d(m);if(n==null||!n.is(":visible")){return null}return{top:n.offset().top,node:m}});e.each(h,function(m,n){n.node.css("top",(100*n.top/k)+"%")});var j=e(document).scrollTop();var i=null;e.each(h,function(m,n){n.node.removeClass("current");if(i==null||(n.top<=j&&n.top>i.top)){i=n}});i&&i.node.addClass("current")};e(window).scroll(function(){f.update()});f.updateClasses();f.update()}}(jQuery)); \ No newline at end of file +(function(e){var b=0;var c=function(){return ++b};var a=function(f){var h=e('');var g=e.map(f,function(i){return e('
  • '+i.text+"
    • ")[0]});h.find("ul").append(g);return h};var d=function(g){var f=e(g).attr("href");if(f.substring(0,1)=="#"){var h=e(f);return h.size()?h:null}return null};window.FlexibleNavMaker=function(f){var g=this;g.nodes=e(f||"h1,h2,h3");g.make=function(){var h=g.nodes.map(function(){var i=e(this);var k=i.attr("id");if(!k){while(!k){k="n"+(c());if(e("#"+k).size()>0){k=null}}i.attr("id",k)}var j=i.attr("data-navtext")||i.text();return{href:"#"+k,text:j}});return a(h)}};window.FlexibleNav=function(g){var f=this;f.nav=e(g);f.updateClasses=function(){f.nav.find("a").each(function(){var h=e(this);var i=d(h);if(i){h.addClass("tnn-"+i[0].nodeName.toLowerCase())}})};f.update=function(){var k=e(document).height();var l=e(window).height();var h=f.nav.find("a").map(function(){var m=e(this);var n=d(m);if(n==null||!n.is(":visible")){return null}return{top:n.offset().top,node:m}});e.each(h,function(m,n){n.node.css("top",(100*n.top/k)+"%")});var j=e(document).scrollTop();var i=null;e.each(h,function(m,n){n.node.removeClass("current");if(i==null||(n.top<=j+10&&n.top>i.top)){i=n}});i&&i.node.addClass("current")};e(window).scroll(function(){f.update()});f.updateClasses();f.update()}}(jQuery)); \ No newline at end of file