aboutsummaryrefslogtreecommitdiffstats
path: root/template-common/lib/ui/effects.pulsate.js
diff options
context:
space:
mode:
authornikrou <nikrou@piwigo.org>2010-02-20 19:56:36 +0000
committernikrou <nikrou@piwigo.org>2010-02-20 19:56:36 +0000
commit6acc3ff7909dd7f070973c112ebd9291862982f8 (patch)
tree20a0875d668206917f88b73983d7021038b43170 /template-common/lib/ui/effects.pulsate.js
parent0c4bdbe01325869a62380c1d2804c34e8a31c1dd (diff)
Feature 1442 : update jquery
* update jquery to 1.4.1 * update jquery ui to 1.7.2 git-svn-id: http://piwigo.org/svn/trunk@4918 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--template-common/lib/ui/effects.pulsate.js25
1 files changed, 13 insertions, 12 deletions
diff --git a/template-common/lib/ui/effects.pulsate.js b/template-common/lib/ui/effects.pulsate.js
index 6f89f7127..6459d1868 100644
--- a/template-common/lib/ui/effects.pulsate.js
+++ b/template-common/lib/ui/effects.pulsate.js
@@ -1,10 +1,10 @@
/*
- * jQuery UI Effects Pulsate
+ * jQuery UI Effects Pulsate 1.7.2
*
- * Copyright (c) 2008 Aaron Eisenberger (aaronchi@gmail.com)
+ * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
* Dual licensed under the MIT (MIT-LICENSE.txt)
* and GPL (GPL-LICENSE.txt) licenses.
- *
+ *
* http://docs.jquery.com/UI/Effects/Pulsate
*
* Depends:
@@ -15,41 +15,42 @@
$.effects.pulsate = function(o) {
return this.queue(function() {
-
+
// Create element
var el = $(this);
-
+
// 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
});
};
el.queue('fx', function() { el.dequeue(); });
el.dequeue();
});
-
+
};
})(jQuery);