From d542bd9977d088bfd693dc937aaf344843a9da7f Mon Sep 17 00:00:00 2001 From: mmcmoritz Date: Wed, 31 Jul 2019 15:28:48 -0500 Subject: [PATCH] fixed jq3 bug --- scrollimate.js | 2 +- scrollimate.min.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scrollimate.js b/scrollimate.js index d37ecef..8b8b71a 100644 --- a/scrollimate.js +++ b/scrollimate.js @@ -482,7 +482,7 @@ var scrollimate = (function( window, $ ){ }, 100); } - $(window).load(function(){ + $(window).on('load', function(){ _saTabsHashChangeFunct(); }); diff --git a/scrollimate.min.js b/scrollimate.min.js index f35416a..960398c 100644 --- a/scrollimate.min.js +++ b/scrollimate.min.js @@ -1 +1 @@ -var scrollimate=function(t,a){var e={wp:0,prlx:!1,speed:1,saBgLay:[],saWinHi:"",mobileEnabled:!1,isMObile:!1,indexable:!0,transition_type:""},s=function(a){for(var e=t,s=a.split("."),n=s.pop(),o=0;o767?n():e.saBgLay.css("transform","translate3d(0, 0, 0)")},o=function(t){for(var s=0;s1&&(o=1,"center"===c[1]?l=-l/2*c[0]:l*=c[1]);var f=1;f=""===r.attr("data-sabglayer")?1:c[0];var d={saBg:t[s],tOfSet:i,winHi:e.saWinHi,spd:f,elHeight:l,left:"0px",flag:o};"translateX(-50%)"===r.css("transform")&&(d.left="-50%"),n(d)}};jQuery.expr[":"].focus=function(t){return t===document.activeElement&&(t.type||t.href)};var r={saTabsHashKeyListener:function(e){a(".tabscroll_activeNavi").find("a, button").is(":focus")&&("36"==(e=e||t.event).keyCode?a("[data-tabscrollnavi]:first-child").find("a, button").trigger("click").focus():"35"==e.keyCode?a(a("[data-tabscrollnavi]")[a("[data-tabscrollnavi]").length-1]).find("a, button").trigger("click").focus():"37"==e.keyCode?a(".tabscroll_activeNavi").prev("[data-tabscrollnavi]").find("a, button").trigger("click").focus():"39"==e.keyCode&&a(".tabscroll_activeNavi").next("[data-tabscrollnavi]").find("a, button").trigger("click").focus())},saTabsPrepActiveElement:function(t){t.attr("aria-selected","true").attr("tabindex","0").addClass("this--active").parent().addClass("tabscroll_activeNavi")},saTabsPrepInactiveElement:function(t){t.attr("aria-selected","false").attr("tabindex","-1").removeClass("this--active").parent().removeClass("tabscroll_activeNavi")}},i=function(s){a(document).trigger("satabchanged");var n,o=function(t){for(var e=a("[data-tabscrollnavi]"),s=0;s767?(void 0===o&&(o="33%"),r.css("float","left"),r.css("padding-bottom",o),r.css("width",l+"%").removeClass("active"),a(r[0]).css("width",s+"%").addClass("active")):(r.css("width","100%"),r.css("height",0).css("padding-bottom",l+"%").removeClass("active"),a(r[0]).css("height",0).css("padding-bottom",s+"%").addClass("active")),void 0===n&&(n="click"),r.on(n,function(){a(t).width()>767?(r.css("width",l+"%").removeClass("active"),a(this).css("width",s+"%").addClass("active")):(r.css("width","100%"),r.css("height",0).css("padding-bottom",l+"%").removeClass("active"),a(this).css("height",0).css("padding-bottom",s+"%").addClass("active"))}),setTimeout(function(){r.css("transition","all 0.6s")},1e3)};r(),t.addEventListener("resize",function(){r()})};jQuery.fn.saAccordion=function(t,a,e){return l(this,t,a,e),this};jQuery.fn.saUnderline=function(){return scrollimate.saUnderline(a(this)),this};var c=function(e){var s,n="#ffffff",o="click",r=!1;void 0!==e?(s=e.target||a(".ripple"),n=e.color||"#ffffff",o=e.interaction||"click",r=e.noclass||!1):s=a(".ripple"),a("#scrollimate__ripplestyles").length||a('\x3c!--[if IE 9]>"),r=a(s).offset(),i=e.pageX-r.left,l=e.pageY-r.top;o.addClass("ripple-effect");var c=a(".ripple-effect");c.css("height",a(s).height()),c.css("width",a(s).height());var f=a(s).data("ripplecolor")||n;o.css({top:l-c.height()/2,left:i-c.width()/2,background:f}).appendTo(a(s)),t.setTimeout(function(){o.remove()},1500)},l=!1;"mouseover"===o?(s.on(o,function(t){!0===l&&(i(t,this),l=!1)}),s.on("mouseout",function(){l=!0})):s.on(o,function(t){i(t,this)})};jQuery.fn.saRipple=function(t){for(var e,s=0;se||l>e||i<-e||l<-e?(i>12*e||l>12*e||i<12*-e||l<12*-e)&&a.css("transform","translate(0px, 0px"):a.css("transform","translate("+i+"px, "+l+"px")},m=function(t){t.addClass("scrollimate-springyelement"),a("#scrollimate__springyelementstyles").length||a('').appendTo(a("head"))},u=function(t,e){e=e||20,m(t),t.each(function(){var t=a(this);f(t),t.on("mouseenter",function(a){t.attr("data-springyx",a.pageX),t.attr("data-springyy",a.pageY)}),t.on("mousemove",function(a){p(a,t,e)}),t.on("touchmove",function(a){p(a,t,e,!0)}),t.on("mouseup, mouseout",function(){d(t)}),t.on("touchend",function(){d(t)})})};jQuery.fn.springyElement=function(t){return u(a(this),t),this};var v=function(t,s,n,o){void 0!==t&&t.each(function(){if(e.wp+e.saWinHi>a(this).offset().top){var t=a(this);setTimeout(function(){t.addClass(n)},o)}else s&&a(this).removeClass(n)})},h=function(s,n){var o=!1,r="this--nowinview",i=0;void 0!==n&&(o=n.repeat||o,r=n.classname||r,i=n.delay||i),e.wp=a(t).scrollTop(),v(s,o,r,i),a(t).scroll(function(){v(s,o,r,i)})};jQuery.fn.scrollstuff=function(t){return h(this,t),this};return{enableMobile:function(){e.mobileEnabled=!0},init:function(n){a(function(){if(e.saWinHi="innerHeight"in t?t.innerHeight:document.documentElement.offsetHeight,e.wp=a(t).scrollTop(),"[object Array]"==Object.prototype.toString.call(n)){console.log("Classic Init Method classically calling the following Methods: ");for(var r=0;r").text(e+" "))})}},springyElement:u}}(window,jQuery); \ No newline at end of file +var scrollimate=function(t,a){var e={wp:0,prlx:!1,speed:1,saBgLay:[],saWinHi:"",mobileEnabled:!1,isMObile:!1,indexable:!0,transition_type:""},s=function(a){for(var e=t,s=a.split("."),n=s.pop(),o=0;o767?n():e.saBgLay.css("transform","translate3d(0, 0, 0)")},o=function(t){for(var s=0;s1&&(o=1,"center"===c[1]?l=-l/2*c[0]:l*=c[1]);var f=1;f=""===r.attr("data-sabglayer")?1:c[0];var d={saBg:t[s],tOfSet:i,winHi:e.saWinHi,spd:f,elHeight:l,left:"0px",flag:o};"translateX(-50%)"===r.css("transform")&&(d.left="-50%"),n(d)}};jQuery.expr[":"].focus=function(t){return t===document.activeElement&&(t.type||t.href)};var r={saTabsHashKeyListener:function(e){a(".tabscroll_activeNavi").find("a, button").is(":focus")&&("36"==(e=e||t.event).keyCode?a("[data-tabscrollnavi]:first-child").find("a, button").trigger("click").focus():"35"==e.keyCode?a(a("[data-tabscrollnavi]")[a("[data-tabscrollnavi]").length-1]).find("a, button").trigger("click").focus():"37"==e.keyCode?a(".tabscroll_activeNavi").prev("[data-tabscrollnavi]").find("a, button").trigger("click").focus():"39"==e.keyCode&&a(".tabscroll_activeNavi").next("[data-tabscrollnavi]").find("a, button").trigger("click").focus())},saTabsPrepActiveElement:function(t){t.attr("aria-selected","true").attr("tabindex","0").addClass("this--active").parent().addClass("tabscroll_activeNavi")},saTabsPrepInactiveElement:function(t){t.attr("aria-selected","false").attr("tabindex","-1").removeClass("this--active").parent().removeClass("tabscroll_activeNavi")}},i=function(s){a(document).trigger("satabchanged");var n,o=function(t){for(var e=a("[data-tabscrollnavi]"),s=0;s767?(void 0===o&&(o="33%"),r.css("float","left"),r.css("padding-bottom",o),r.css("width",l+"%").removeClass("active"),a(r[0]).css("width",s+"%").addClass("active")):(r.css("width","100%"),r.css("height",0).css("padding-bottom",l+"%").removeClass("active"),a(r[0]).css("height",0).css("padding-bottom",s+"%").addClass("active")),void 0===n&&(n="click"),r.on(n,function(){a(t).width()>767?(r.css("width",l+"%").removeClass("active"),a(this).css("width",s+"%").addClass("active")):(r.css("width","100%"),r.css("height",0).css("padding-bottom",l+"%").removeClass("active"),a(this).css("height",0).css("padding-bottom",s+"%").addClass("active"))}),setTimeout(function(){r.css("transition","all 0.6s")},1e3)};r(),t.addEventListener("resize",function(){r()})};jQuery.fn.saAccordion=function(t,a,e){return l(this,t,a,e),this};jQuery.fn.saUnderline=function(){return scrollimate.saUnderline(a(this)),this};var c=function(e){var s,n="#ffffff",o="click",r=!1;void 0!==e?(s=e.target||a(".ripple"),n=e.color||"#ffffff",o=e.interaction||"click",r=e.noclass||!1):s=a(".ripple"),a("#scrollimate__ripplestyles").length||a('\x3c!--[if IE 9]>"),r=a(s).offset(),i=e.pageX-r.left,l=e.pageY-r.top;o.addClass("ripple-effect");var c=a(".ripple-effect");c.css("height",a(s).height()),c.css("width",a(s).height());var f=a(s).data("ripplecolor")||n;o.css({top:l-c.height()/2,left:i-c.width()/2,background:f}).appendTo(a(s)),t.setTimeout(function(){o.remove()},1500)},l=!1;"mouseover"===o?(s.on(o,function(t){!0===l&&(i(t,this),l=!1)}),s.on("mouseout",function(){l=!0})):s.on(o,function(t){i(t,this)})};jQuery.fn.saRipple=function(t){for(var e,s=0;se||l>e||i<-e||l<-e?(i>12*e||l>12*e||i<12*-e||l<12*-e)&&a.css("transform","translate(0px, 0px"):a.css("transform","translate("+i+"px, "+l+"px")},m=function(t){t.addClass("scrollimate-springyelement"),a("#scrollimate__springyelementstyles").length||a('').appendTo(a("head"))},u=function(t,e){e=e||20,m(t),t.each(function(){var t=a(this);f(t),t.on("mouseenter",function(a){t.attr("data-springyx",a.pageX),t.attr("data-springyy",a.pageY)}),t.on("mousemove",function(a){p(a,t,e)}),t.on("touchmove",function(a){p(a,t,e,!0)}),t.on("mouseup, mouseout",function(){d(t)}),t.on("touchend",function(){d(t)})})};jQuery.fn.springyElement=function(t){return u(a(this),t),this};var v=function(t,s,n,o){void 0!==t&&t.each(function(){if(e.wp+e.saWinHi>a(this).offset().top){var t=a(this);setTimeout(function(){t.addClass(n)},o)}else s&&a(this).removeClass(n)})},h=function(s,n){var o=!1,r="this--nowinview",i=0;void 0!==n&&(o=n.repeat||o,r=n.classname||r,i=n.delay||i),e.wp=a(t).scrollTop(),v(s,o,r,i),a(t).scroll(function(){v(s,o,r,i)})};jQuery.fn.scrollstuff=function(t){return h(this,t),this};return{enableMobile:function(){e.mobileEnabled=!0},init:function(n){a(function(){if(e.saWinHi="innerHeight"in t?t.innerHeight:document.documentElement.offsetHeight,e.wp=a(t).scrollTop(),"[object Array]"==Object.prototype.toString.call(n)){console.log("Classic Init Method classically calling the following Methods: ");for(var r=0;r").text(e+" "))})}},springyElement:u}}(window,jQuery); \ No newline at end of file