r1602 - trunk/ui
r1602 - trunk/ui
Author: scott.gonzalez
Date: Tue Jan 13 18:00:25 2009
New Revision: 1602
Modified:
trunk/ui/effects.pulsate.js
Log:
Pulsate: Fixed duration.
Modified: trunk/ui/effects.pulsate.js
==============================================================================
--- trunk/ui/effects.pulsate.js (original)
+++ trunk/ui/effects.pulsate.js Tue Jan 13 18:00:25 2009
@@ -22,27 +22,28 @@
// Set options
var mode = $.effects.setMode(el, o.options.mode || 'show'); // Set Mode
var times = o.options.times || 5; // Default # of times
-
+ var duration = o.duration ? o.duration / 2 : $.fx.speeds._default / 2;
+
// Adjust
if (mode == 'hide') times--;
if (el.is(':hidden')) { // Show fadeIn
el.css('opacity', 0);
el.show(); // Show
- el.animate({opacity: 1}, o.duration / 2, o.options.easing);
+ el.animate({opacity: 1}, duration, o.options.easing);
times = times-2;
}
// Animate
for (var i = 0; i < times; i++) { // Pulsate
- el.animate({opacity: 0}, o.duration / 2,
o.options.easing).animate({opacity: 1}, o.duration / 2, o.options.easing);
+ el.animate({opacity: 0}, duration, o.options.easing).animate({opacity:
1}, duration, o.options.easing);
};
if (mode == 'hide') { // Last Pulse
- el.animate({opacity: 0}, o.duration / 2, o.options.easing, function(){
+ el.animate({opacity: 0}, duration, o.options.easing, function(){
el.hide(); // Hide
if(o.callback) o.callback.apply(this, arguments); // Callback
});
} else {
- el.animate({opacity: 0}, o.duration / 2,
o.options.easing).animate({opacity: 1}, o.duration / 2, o.options.easing,
function(){
+ el.animate({opacity: 0}, duration, o.options.easing).animate({opacity:
1}, duration, o.options.easing, function(){
if(o.callback) o.callback.apply(this, arguments); // Callback
});
};