From 53fd5d21bee626fcfd5d1d51d6c7476f9c864672 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Thu, 30 May 2013 21:18:50 +0200 Subject: navigation.js: remove jquery.scrollTo and use default jquery.animate --- htdocs/static/js/jquery.scrollTo-1.4.3.1-min.js | 7 ------- htdocs/static/js/navigation.js | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 htdocs/static/js/jquery.scrollTo-1.4.3.1-min.js diff --git a/htdocs/static/js/jquery.scrollTo-1.4.3.1-min.js b/htdocs/static/js/jquery.scrollTo-1.4.3.1-min.js deleted file mode 100644 index 8b5f447..0000000 --- a/htdocs/static/js/jquery.scrollTo-1.4.3.1-min.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - * Copyright (c) 2007-2012 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com - * Dual licensed under MIT and GPL. - * @author Ariel Flesler - * @version 1.4.3.1 - */ -;(function($){var h=$.scrollTo=function(a,b,c){$(window).scrollTo(a,b,c)};h.defaults={axis:'xy',duration:parseFloat($.fn.jquery)>=1.3?0:1,limit:true};h.window=function(a){return $(window)._scrollable()};$.fn._scrollable=function(){return this.map(function(){var a=this,isWin=!a.nodeName||$.inArray(a.nodeName.toLowerCase(),['iframe','#document','html','body'])!=-1;if(!isWin)return a;var b=(a.contentWindow||a).document||a.ownerDocument||a;return/webkit/i.test(navigator.userAgent)||b.compatMode=='BackCompat'?b.body:b.documentElement})};$.fn.scrollTo=function(e,f,g){if(typeof f=='object'){g=f;f=0}if(typeof g=='function')g={onAfter:g};if(e=='max')e=9e9;g=$.extend({},h.defaults,g);f=f||g.duration;g.queue=g.queue&&g.axis.length>1;if(g.queue)f/=2;g.offset=both(g.offset);g.over=both(g.over);return this._scrollable().each(function(){if(e==null)return;var d=this,$elem=$(d),targ=e,toff,attr={},win=$elem.is('html,body');switch(typeof targ){case'number':case'string':if(/^([+-]=)?\d+(\.\d+)?(px|%)?$/.test(targ)){targ=both(targ);break}targ=$(targ,this);if(!targ.length)return;case'object':if(targ.is||targ.style)toff=(targ=$(targ)).offset()}$.each(g.axis.split(''),function(i,a){var b=a=='x'?'Left':'Top',pos=b.toLowerCase(),key='scroll'+b,old=d[key],max=h.max(d,a);if(toff){attr[key]=toff[pos]+(win?0:old-$elem.offset()[pos]);if(g.margin){attr[key]-=parseInt(targ.css('margin'+b))||0;attr[key]-=parseInt(targ.css('border'+b+'Width'))||0}attr[key]+=g.offset[pos]||0;if(g.over[pos])attr[key]+=targ[a=='x'?'width':'height']()*g.over[pos]}else{var c=targ[pos];attr[key]=c.slice&&c.slice(-1)=='%'?parseFloat(c)/100*max:c}if(g.limit&&/^\d+$/.test(attr[key]))attr[key]=attr[key]<=0?0:Math.min(attr[key],max);if(!i&&g.queue){if(old!=attr[key])animate(g.onAfterFirst);delete attr[key]}});animate(g.onAfter);function animate(a){$elem.animate(attr,f,g.easing,a&&function(){a.call(this,e,g)})}}).end()};h.max=function(a,b){var c=b=='x'?'Width':'Height',scroll='scroll'+c;if(!$(a).is('html,body'))return a[scroll]-$(a)[c.toLowerCase()]();var d='client'+c,html=a.ownerDocument.documentElement,body=a.ownerDocument.body;return Math.max(html[scroll],body[scroll])-Math.min(html[d],body[d])};function both(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery); \ No newline at end of file diff --git a/htdocs/static/js/navigation.js b/htdocs/static/js/navigation.js index cb56db5..4919f8a 100644 --- a/htdocs/static/js/navigation.js +++ b/htdocs/static/js/navigation.js @@ -14,7 +14,7 @@ $(window).keydown(function(e) { liSelected = li.eq(0).addClass('selected'); } - $('body').scrollTo(liSelected, {offset: -20}); + $('html').animate({scrollTop: liSelected.offset().top - 20}, 500); return false; } @@ -31,7 +31,7 @@ $(window).keydown(function(e) { liSelected = li.last().addClass('selected'); } - $('body').scrollTo(liSelected, {offset: -20}); + $('html').animate({scrollTop: liSelected.offset().top - 20}, 500); return false; } -- cgit v1.2.3-1-g7c22