From eedb1442598ba97bea198b205aa8bc42638fb3dc Mon Sep 17 00:00:00 2001 From: J Kendal <13680617+joekendal@users.noreply.github.com> Date: Mon, 11 Jun 2018 19:46:25 +0100 Subject: [PATCH 1/2] Update jquery.scrollme.js --- jquery.scrollme.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jquery.scrollme.js b/jquery.scrollme.js index cffb929..655f5bf 100644 --- a/jquery.scrollme.js +++ b/jquery.scrollme.js @@ -120,7 +120,7 @@ var scrollme = ( function( $ ) // Recalculate heights & positions when page is fully loaded + a bit just in case - $window.load( function(){ setTimeout( function(){ _this.on_resize(); } , 100 ) }); + $(document).ready( function(){ setTimeout( function(){ _this.on_resize(); } , 100 ) }); // Start animating @@ -444,7 +444,7 @@ var scrollme = ( function( $ ) // ---------------------------------------------------------------------------------------------------- // Bind initialisation - $document.on( _this.init_events.join( ' ' ) , function(){ _this.init(); } ); + $('document').ready(function(){ _this.init(); }); // ---------------------------------------------------------------------------------------------------- From 5be6ef6f16944c03ea64dc0eb2d443404ba20fa9 Mon Sep 17 00:00:00 2001 From: J Kendal <13680617+joekendal@users.noreply.github.com> Date: Mon, 11 Jun 2018 19:47:10 +0100 Subject: [PATCH 2/2] Update jquery.scrollme.min.js --- jquery.scrollme.min.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jquery.scrollme.min.js b/jquery.scrollme.min.js index d82af9a..e221a53 100644 --- a/jquery.scrollme.min.js +++ b/jquery.scrollme.min.js @@ -3,4 +3,4 @@ // A jQuery plugin for adding simple scrolling effects to web pages // http://scrollme.nckprsn.com // ---------------------------------------------------------------------------------------------------- -var scrollme=(function(a){var d={};var c=a(document);var b=a(window);d.body_height=0;d.viewport_height=0;d.viewport_top=0;d.viewport_bottom=0;d.viewport_top_previous=-1;d.elements=[];d.elements_in_view=[];d.property_defaults={opacity:1,translatex:0,translatey:0,translatez:0,rotatex:0,rotatey:0,rotatez:0,scale:1,scalex:1,scaley:1,scalez:1};d.scrollme_selector=".scrollme";d.animateme_selector=".animateme";d.update_interval=10;d.easing_functions={linear:function(e){return e},easeout:function(e){return e*e*e},easein:function(e){e=1-e;return 1-(e*e*e)},easeinout:function(e){if(e<0.5){return(4*e*e*e)}else{e=1-e;return 1-(4*e*e*e)}}};d.init_events=["ready","page:load","page:change"];d.init_if=function(){return true};d.init=function(){if(!d.init_if()){return false}d.init_elements();d.on_resize();b.on("resize orientationchange",function(){d.on_resize()});b.load(function(){setTimeout(function(){d.on_resize()},100)});setInterval(d.update,d.update_interval);return true};d.init_elements=function(){a(d.scrollme_selector).each(function(){var e={};e.element=a(this);var f=[];a(this).find(d.animateme_selector).addBack(d.animateme_selector).each(function(){var h={};h.element=a(this);h.when=h.element.data("when");h.from=h.element.data("from");h.to=h.element.data("to");if(h.element.is("[data-crop]")){h.crop=h.element.data("crop")}else{h.crop=true}if(h.element.is("[data-easing]")){h.easing=d.easing_functions[h.element.data("easing")]}else{h.easing=d.easing_functions.easeout}var g={};if(h.element.is("[data-opacity]")){g.opacity=h.element.data("opacity")}if(h.element.is("[data-translatex]")){g.translatex=h.element.data("translatex")}if(h.element.is("[data-translatey]")){g.translatey=h.element.data("translatey")}if(h.element.is("[data-translatez]")){g.translatez=h.element.data("translatez")}if(h.element.is("[data-rotatex]")){g.rotatex=h.element.data("rotatex")}if(h.element.is("[data-rotatey]")){g.rotatey=h.element.data("rotatey")}if(h.element.is("[data-rotatez]")){g.rotatez=h.element.data("rotatez")}if(h.element.is("[data-scale]")){g.scale=h.element.data("scale")}if(h.element.is("[data-scalex]")){g.scalex=h.element.data("scalex")}if(h.element.is("[data-scaley]")){g.scaley=h.element.data("scaley")}if(h.element.is("[data-scalez]")){g.scalez=h.element.data("scalez")}h.properties=g;f.push(h)});e.effects=f;d.elements.push(e)})};d.update=function(){window.requestAnimationFrame(function(){d.update_viewport_position();if(d.viewport_top_previous!=d.viewport_top){d.update_elements_in_view();d.animate()}d.viewport_top_previous=d.viewport_top})};d.animate=function(){var C=d.elements_in_view.length;for(var A=0;A(d.body_height-d.viewport_height)){n=d.body_height-d.viewport_height}}var g=(d.viewport_top-r)/(n-r);var x=w.from;var j=w.to;var o=j-x;var k=(g-x)/o;var v=w.easing(k);var l=d.animate_value(g,v,x,j,w,"opacity");var t=d.animate_value(g,v,x,j,w,"translatey");var u=d.animate_value(g,v,x,j,w,"translatex");var s=d.animate_value(g,v,x,j,w,"translatez");var B=d.animate_value(g,v,x,j,w,"rotatex");var z=d.animate_value(g,v,x,j,w,"rotatey");var y=d.animate_value(g,v,x,j,w,"rotatez");var E=d.animate_value(g,v,x,j,w,"scale");var q=d.animate_value(g,v,x,j,w,"scalex");var p=d.animate_value(g,v,x,j,w,"scaley");var m=d.animate_value(g,v,x,j,w,"scalez");if("scale" in w.properties){q=E;p=E;m=E}w.element.css({opacity:l,transform:"translate3d( "+u+"px , "+t+"px , "+s+"px ) rotateX( "+B+"deg ) rotateY( "+z+"deg ) rotateZ( "+y+"deg ) scale3d( "+q+" , "+p+" , "+m+" )"})}}};d.animate_value=function(i,h,j,k,n,m){var g=d.property_defaults[m];if(!(m in n.properties)){return g}var e=n.properties[m];var f=(k>j)?true:false;if(ik&&f){return e}if(i>j&&!f){return g}if(id.viewport_top)){d.elements_in_view.push(d.elements[e])}}};d.on_resize=function(){d.update_viewport();d.update_element_heights();d.update_viewport_position();d.update_elements_in_view();d.animate()};d.update_viewport=function(){d.body_height=c.height();d.viewport_height=b.height()};d.update_element_heights=function(){var g=d.elements.length;for(var f=0;fk.body_height-k.viewport_height&&(s=k.body_height-k.viewport_height));var l=(k.viewport_top-r)/(s-r),m=o.from,p=o.to,c=(l-m)/(p-m),_=o.easing(c),u=k.animate_value(l,_,m,p,o,"opacity"),d=k.animate_value(l,_,m,p,o,"translatey"),v=k.animate_value(l,_,m,p,o,"translatex"),h=k.animate_value(l,_,m,p,o,"translatez"),f=k.animate_value(l,_,m,p,o,"rotatex"),w=k.animate_value(l,_,m,p,o,"rotatey"),g=k.animate_value(l,_,m,p,o,"rotatez"),y=k.animate_value(l,_,m,p,o,"scale"),x=k.animate_value(l,_,m,p,o,"scalex"),z=k.animate_value(l,_,m,p,o,"scaley"),b=k.animate_value(l,_,m,p,o,"scalez");"scale"in o.properties&&(b=z=x=y),o.element.css({opacity:u,transform:"translate3d( "+v+"px , "+d+"px , "+h+"px ) rotateX( "+f+"deg ) rotateY( "+w+"deg ) rotateZ( "+g+"deg ) scale3d( "+x+" , "+z+" , "+b+" )"})}},k.animate_value=function(e,t,a,n,i,o){var r=k.property_defaults[o];if(!(o in i.properties))return r;var s=i.properties[o],l=ak.viewport_top&&k.elements_in_view.push(k.elements[t])},k.on_resize=function(){k.update_viewport(),k.update_element_heights(),k.update_viewport_position(),k.update_elements_in_view(),k.animate()},k.update_viewport=function(){k.body_height=e.height(),k.viewport_height=t.height()},k.update_element_heights=function(){for(var e=k.elements.length,t=0;t