Quick fix for $.scrollTo on chrome: if using chrome or chromium, scroll from documentElement, not body element. (this is a change to 3rd party library) (#12642)

2 files changed, 7 insertions, 3 deletions

diff --git a/libs/bower_components/jquery.scrollTo/jquery.scrollTo.js b/libs/bower_components/jquery.scrollTo/jquery.scrollTo.js
index 8b88b8eaa7..406b7dc91f 100644
--- a/libs/bower_components/jquery.scrollTo/jquery.scrollTo.js
+++ b/libs/bower_components/jquery.scrollTo/jquery.scrollTo.js
@@ -39,8 +39,9 @@
 						return elem;
 
 				var doc = (elem.contentWindow || elem).document || elem.ownerDocument || elem;
+				var isWebkit = /webkit/i.test(navigator.userAgent) && !/chrom/i.test(navigator.userAgent);
 
-				return /webkit/i.test(navigator.userAgent) || doc.compatMode == 'BackCompat' ?
+				return isWebkit || doc.compatMode == 'BackCompat' ?
 					doc.body :
 					doc.documentElement;
 			});
diff --git a/libs/bower_components/jquery.scrollTo/jquery.scrollTo.min.js b/libs/bower_components/jquery.scrollTo/jquery.scrollTo.min.js
index d9f9b1599c..a1d40fa255 100644
--- a/libs/bower_components/jquery.scrollTo/jquery.scrollTo.min.js
+++ b/libs/bower_components/jquery.scrollTo/jquery.scrollTo.min.js
@@ -1,7 +1,10 @@
-/**
+/*!
+ * jQuery.scrollTo
  * Copyright (c) 2007-2014 Ariel Flesler - aflesler<a>gmail<d>com | http://flesler.blogspot.com
  * Licensed under MIT
+ * http://flesler.blogspot.com/2007/10/jqueryscrollto.html
+ * @projectDescription Easy element scrolling using jQuery.
  * @author Ariel Flesler
  * @version 1.4.14
  */
-;(function(k){'use strict';k(['jquery'],function($){var j=$.scrollTo=function(a,b,c){return $(window).scrollTo(a,b,c)};j.defaults={axis:'xy',duration:0,limit:!0};j.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(f,g,h){if(typeof g=='object'){h=g;g=0}if(typeof h=='function')h={onAfter:h};if(f=='max')f=9e9;h=$.extend({},j.defaults,h);g=g||h.duration;h.queue=h.queue&&h.axis.length>1;if(h.queue)g/=2;h.offset=both(h.offset);h.over=both(h.over);return this._scrollable().each(function(){if(f==null)return;var d=this,$elem=$(d),targ=f,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=win?$(targ):$(targ,this);if(!targ.length)return;case'object':if(targ.is||targ.style)toff=(targ=$(targ)).offset()}var e=$.isFunction(h.offset)&&h.offset(d,targ)||h.offset;$.each(h.axis.split(''),function(i,a){var b=a=='x'?'Left':'Top',pos=b.toLowerCase(),key='scroll'+b,old=d[key],max=j.max(d,a);if(toff){attr[key]=toff[pos]+(win?0:old-$elem.offset()[pos]);if(h.margin){attr[key]-=parseInt(targ.css('margin'+b))||0;attr[key]-=parseInt(targ.css('border'+b+'Width'))||0}attr[key]+=e[pos]||0;if(h.over[pos])attr[key]+=targ[a=='x'?'width':'height']()*h.over[pos]}else{var c=targ[pos];attr[key]=c.slice&&c.slice(-1)=='%'?parseFloat(c)/100*max:c}if(h.limit&&/^\d+$/.test(attr[key]))attr[key]=attr[key]<=0?0:Math.min(attr[key],max);if(!i&&h.queue){if(old!=attr[key])animate(h.onAfterFirst);delete attr[key]}});animate(h.onAfter);function animate(a){$elem.animate(attr,g,h.easing,a&&function(){a.call(this,targ,h)})}}).end()};j.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 $.isFunction(a)||$.isPlainObject(a)?a:{top:a,left:a}}return j})}(typeof define==='function'&&define.amd?define:function(a,b){if(typeof module!=='undefined'&&module.exports){module.exports=b(require('jquery'))}else{b(jQuery)}}));
\ No newline at end of file
+!function(e){"use strict";e(["jquery"],function(e){var t=e.scrollTo=function(t,n,o){return e(window).scrollTo(t,n,o)};function n(t){return e.isFunction(t)||e.isPlainObject(t)?t:{top:t,left:t}}return t.defaults={axis:"xy",duration:0,limit:!0},t.window=function(t){return e(window)._scrollable()},e.fn._scrollable=function(){return this.map(function(){if(!(!this.nodeName||-1!=e.inArray(this.nodeName.toLowerCase(),["iframe","#document","html","body"])))return this;var t=(this.contentWindow||this).document||this.ownerDocument||this;return/webkit/i.test(navigator.userAgent)&&!/chrom/i.test(navigator.userAgent)||"BackCompat"==t.compatMode?t.body:t.documentElement})},e.fn.scrollTo=function(o,i,r){return"object"==typeof i&&(r=i,i=0),"function"==typeof r&&(r={onAfter:r}),"max"==o&&(o=9e9),r=e.extend({},t.defaults,r),i=i||r.duration,r.queue=r.queue&&r.axis.length>1,r.queue&&(i/=2),r.offset=n(r.offset),r.over=n(r.over),this._scrollable().each(function(){if(null!=o){var s,u=this,a=e(u),f=o,c={},l=a.is("html,body");switch(typeof f){case"number":case"string":if(/^([+-]=?)?\d+(\.\d+)?(px|%)?$/.test(f)){f=n(f);break}if(!(f=l?e(f):e(f,this)).length)return;case"object":(f.is||f.style)&&(s=(f=e(f)).offset())}var d=e.isFunction(r.offset)&&r.offset(u,f)||r.offset;e.each(r.axis.split(""),function(e,n){var o="x"==n?"Left":"Top",i=o.toLowerCase(),h="scroll"+o,p=u[h],w=t.max(u,n);if(s)c[h]=s[i]+(l?0:p-a.offset()[i]),r.margin&&(c[h]-=parseInt(f.css("margin"+o))||0,c[h]-=parseInt(f.css("border"+o+"Width"))||0),c[h]+=d[i]||0,r.over[i]&&(c[h]+=f["x"==n?"width":"height"]()*r.over[i]);else{var y=f[i];c[h]=y.slice&&"%"==y.slice(-1)?parseFloat(y)/100*w:y}r.limit&&/^\d+$/.test(c[h])&&(c[h]=c[h]<=0?0:Math.min(c[h],w)),!e&&r.queue&&(p!=c[h]&&m(r.onAfterFirst),delete c[h])}),m(r.onAfter)}function m(e){a.animate(c,i,r.easing,e&&function(){e.call(this,f,r)})}}).end()},t.max=function(t,n){var o="x"==n?"Width":"Height",i="scroll"+o;if(!e(t).is("html,body"))return t[i]-e(t)[o.toLowerCase()]();var r="client"+o,s=t.ownerDocument.documentElement,u=t.ownerDocument.body;return Math.max(s[i],u[i])-Math.min(s[r],u[r])},t})}("function"==typeof define&&define.amd?define:function(e,t){"undefined"!=typeof module&&module.exports?module.exports=t(require("jquery")):t(jQuery)});
\ No newline at end of file