Commit:    f6d668e4776256bc4ef0b04e38ae0460c8b7f739
Author:    Dejan Marjanovic <[email protected]>         Sat, 23 Nov 
2013 22:26:33 +0100
Parents:   6961058e02a54f5ac27b60389bd604b3d200f1f1
Branches:  master

Link:       
http://git.php.net/?p=web/php.git;a=commitdiff;h=f6d668e4776256bc4ef0b04e38ae0460c8b7f739

Log:
Update $.scrollTo and rewrite param scroll logic

Changed paths:
  M  js/common.js


Diff:
diff --git a/js/common.js b/js/common.js
index 44f6896..075ed49 100755
--- a/js/common.js
+++ b/js/common.js
@@ -44,16 +44,13 @@ function scroll(target, interval)
 /* }}} */
 
 /** {{{
- * jQuery.ScrollTo - Easy element scrolling using jQuery.
- * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | 
http://flesler.blogspot.com
- * Dual licensed under MIT and GPL.
- * Date: 5/25/2009
- * @author Ariel Flesler
- * @version 1.4.2
- *
- * http://flesler.blogspot.com/2007/10/jqueryscrollto.html
- */
-;(function(d){var 
k=d.scrollTo=function(a,i,e){d(window).scrollTo(a,i,e)};k.defaults={axis:'xy',duration:parseFloat(d.fn.jquery)>=1.3?0:1};k.window=function(a){return
 d(window)._scrollable()};d.fn._scrollable=function(){return 
this.map(function(){var 
a=this,i=!a.nodeName||d.inArray(a.nodeName.toLowerCase(),['iframe','#document','html','body'])!=-1;if(!i)return
 a;var e=(a.contentWindow||a).document||a.ownerDocument||a;return 
d.browser.safari||e.compatMode=='BackCompat'?e.body:e.documentElement})};d.fn.scrollTo=function(n,j,b){if(typeof
 j=='object'){b=j;j=0}if(typeof 
b=='function')b={onAfter:b};if(n=='max')n=9e9;b=d.extend({},k.defaults,b);j=j||b.speed||b.duration;b.queue=b.queue&&b.axis.length>1;if(b.queue)j/=2;b.offset=p(b.offset);b.over=p(b.over);return
 this._scrollable().each(function(){var 
q=this,r=d(q),f=n,s,g={},u=r.is('html,body');switch(typeof 
f){case'number':case'string':if(/^([+-]=)?\d+(\.\d+)?(px|%)?$/.test(f)){f=p(f);break}f=d(f,this);case'object':if(f.is||f.style)s=(f=d(f)).offset()}d.each(b.axis.split(''),function(a,i){var
 
e=i=='x'?'Left':'Top',h=e.toLowerCase(),c='scroll'+e,l=q[c],m=k.max(q,i);if(s){g[c]=s[h]+(u?0:l-r.offset()[h]);if(b.margin){g[c]-=parseInt(f.css('margin'+e))||0;g[c]-=parseInt(f.css('border'+e+'Width'))||0}g[c]+=b.offset[h]||0;if(b.over[h])g[c]+=f[i=='x'?'width':'height']()*b.over[h]}else{var
 
o=f[h];g[c]=o.slice&&o.slice(-1)=='%'?parseFloat(o)/100*m:o}if(/^\d+$/.test(g[c]))g[c]=g[c]<=0?0:Math.min(g[c],m);if(!a&&b.queue){if(l!=g[c])t(b.onAfterFirst);delete
 g[c]}});t(b.onAfter);function 
t(a){r.animate(g,j,b.easing,a&&function(){a.call(this,n,b)})}}).end()};k.max=function(a,i){var
 e=i=='x'?'Width':'Height',h='scroll'+e;if(!d(a).is('html,body'))return 
a[h]-d(a)[e.toLowerCase()]();var 
c='client'+e,l=a.ownerDocument.documentElement,m=a.ownerDocument.body;return 
Math.max(l[h],m[h])-Math.min(l[c],m[c])};function p(a){return typeof 
a=='object'?a:{top:a,left:a}}})(jQuery);
+* jQuery.ScrollTo - Easy element scrolling using jQuery.
+* Copyright (c) 2007-2013 Ariel Flesler - aflesler<a>gmail<d>com | 
http://flesler.blogspot.com
+* Dual licensed under MIT and GPL.
+* @author Ariel Flesler
+* @version 1.4.6
+*/
+(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,targ,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);
 /*}}}*/
 
 $(window).load(function()
@@ -77,6 +74,8 @@ $(document).ready(function() {
     $docsDivWithId.children("h1, h2, h3, h4").each(function(){
         $(this).append("<a class='genanchor' href='#" + 
$(this).parent().attr("id") + "'> ΒΆ</a>");
     });
+    
+    /**
     var scrollHeightOfHeadnav = - 
document.getElementById('head-nav').scrollHeight;
     scrollHeightOfHeadnav -= 12; //some margin
     $parameters = $refsect1.filter(".parameters").find(".term .parameter");
@@ -95,6 +94,14 @@ $(document).ready(function() {
             }
         });
     });
+    */
+
+    $('.refentry code.parameter').click(function(event)
+    {
+      var id = $(this).text().replace(/^[&$]{0,2}/g, '');
+      var offsetTop = $('.parameters .parameter:contains("' + id + 
'")').offset().top - 52;
+      $.scrollTo({top: offsetTop, left: 0}, 400);
+    });
 
     var $headingsWithIds = $('h1 a[id], h2 a[id], h3 a[id], h4 a[id]');
     $headingsWithIds.each(function(){


--
PHP Webmaster List Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to