diff --git a/jquery.vgrid.js b/jquery.vgrid.js index 94a9ee9..3278be0 100644 --- a/jquery.vgrid.js +++ b/jquery.vgrid.js @@ -310,9 +310,9 @@ if(_c.css("display") == "none"){ return true; } - _c.fadeTo(0, 0); + _c.stop().fadeTo(0, 0); setTimeout(function(){ - _c.fadeTo(_prop.time || 250, 1); + _c.stop().fadeTo(_prop.time || 250, 1); }, i * (_prop.delay || 0)); }); } diff --git a/jquery.vgrid.min.js b/jquery.vgrid.min.js index 1d89f1b..69a8b4b 100644 --- a/jquery.vgrid.min.js +++ b/jquery.vgrid.min.js @@ -15,7 +15,7 @@ function s(a,b){return!a||!b?0:a[0]>b[0]?1:-1}function t(a){var b=a.data("_vgchi d.data("_vgopt").onFinish||null);clearTimeout(f.data("_vgtimeout"));f.data("_vgtimeout",setTimeout(function(){f.animate({left:f.data("_vgleft")+"px",top:f.data("_vgtop")+"px"},j)},c*h))})}}function m(a){a.each(function(){var a=g(this);clearTimeout(a.data("_vgtimeout"));a.data("_vgtimeout",setTimeout(function(){i(a);p(a.data("_vgchild"),a.data("_vgopt").easeing||"linear",a.data("_vgopt").time||500,a.data("_vgopt").delay||0)},300))})}function v(a,b){var e=g("").text(" ").attr("id","_vgridspan").hide().appendTo("body"); e.data("size",e.css("font-size"));e.data("timer",setInterval(function(){e.css("font-size")!=e.data("size")&&(e.data("size",e.css("font-size")),b(a))},500))}function r(a,b){a.data("vgrid-image-event-added")||(a.data("vgrid-image-event-added",1),a.bind("vgrid-added",function(){a.find("img").each(function(){var d=g(this);d.data("vgrid-image-handler")||(d.data("vgrid-image-handler",1),d.bind("load",function(){b(a)}))})}));a.trigger("vgrid-added");var e=a.append,h=a.prepend;a.append=function(){e.apply(a, arguments);a.trigger("vgrid-added")};a.prepend=function(){h.apply(a,arguments);a.trigger("vgrid-added")}}g.fn.extend({vgrid:function(a){var b=g(this),e=a||{};b.each(function(){var a=g(this);a.data("_vgopt",e);a.data("_vgchild",a.find("> *"));a.data("_vgdefchild",a.data("_vgchild"));a.css({position:"relative",width:"auto"});a.data("_vgchild").css("position","absolute");i(a);u(a.data("_vgchild"));if(a.data("_vgopt").fadeIn){var b="object"==typeof a.data("_vgopt").fadeIn?a.data("_vgopt").fadeIn:{time:a.data("_vgopt").fadeIn}; -a.data("_vgchild").each(function(a){var e=g(this);if("none"==e.css("display"))return!0;e.fadeTo(0,0);setTimeout(function(){e.fadeTo(b.time||250,1)},a*(b.delay||0))})}g(window).resize(function(){m(a)});e.useLoadImageEvent&&r(a,m);e.useFontSizeListener&&v(a,m)});return b},vgrefresh:function(a,b,e,h){var d=g(this);d.each(function(){var c=g(this),d=c.data("_vgopt")||{};c.data("_vgchild")&&(c.data("_vgchild",c.find("> *")),c.data("_vgchild").css("position","absolute"),i(c),b="number"==typeof b?b:c.data("_vgopt").time|| -500,e="number"==typeof e?e:c.data("_vgopt").delay||0,p(c.data("_vgchild"),a||c.data("_vgopt").easeing||"linear",b,e),"function"==typeof h&&setTimeout(h,c.data("_vgchild").length*e+b));d.useLoadImageEvent&&r(c,m)});return d},vgsort:function(a,b,e,h){var d=g(this);d.each(function(){var c=g(this);c.data("_vgchild")&&(c.data("_vgchild",c.data("_vgchild").sort(a)),c.data("_vgchild").each(function(){g(this).appendTo(c)}),i(c),p(c.data("_vgchild"),b||c.data("_vgopt").easeing||"linear","number"==typeof e? -e:c.data("_vgopt").time||500,"number"==typeof h?h:c.data("_vgopt").delay||0))});return d}})})(jQuery); +a.data("_vgchild").each(function(a){var e=g(this);if("none"==e.css("display"))return!0;e.stop().fadeTo(0,0);setTimeout(function(){e.stop().fadeTo(b.time||250,1)},a*(b.delay||0))})}g(window).resize(function(){m(a)});e.useLoadImageEvent&&r(a,m);e.useFontSizeListener&&v(a,m)});return b},vgrefresh:function(a,b,e,h){var d=g(this);d.each(function(){var c=g(this),d=c.data("_vgopt")||{};c.data("_vgchild")&&(c.data("_vgchild",c.find("> *")),c.data("_vgchild").css("position","absolute"),i(c),b="number"==typeof b? +b:c.data("_vgopt").time||500,e="number"==typeof e?e:c.data("_vgopt").delay||0,p(c.data("_vgchild"),a||c.data("_vgopt").easeing||"linear",b,e),"function"==typeof h&&setTimeout(h,c.data("_vgchild").length*e+b));d.useLoadImageEvent&&r(c,m)});return d},vgsort:function(a,b,e,h){var d=g(this);d.each(function(){var c=g(this);c.data("_vgchild")&&(c.data("_vgchild",c.data("_vgchild").sort(a)),c.data("_vgchild").each(function(){g(this).appendTo(c)}),i(c),p(c.data("_vgchild"),b||c.data("_vgopt").easeing||"linear", +"number"==typeof e?e:c.data("_vgopt").time||500,"number"==typeof h?h:c.data("_vgopt").delay||0))});return d}})})(jQuery);