Changeset 5313

Timestamp:

04/24/08 21:12:52 (9 months ago)

Author:

joern.zaefferer

Message:

tooltip plugin: improved fadein/out

Files:

• trunk/plugins/tooltip/jquery.tooltip.js (modified) (2 diffs)

trunk/plugins/tooltip/jquery.tooltip.js

@@ -187 +187 @@
         tID = null;
         if (settings(current).fade) {
-            if (!helper.parent.is(":animated"))
+            if (helper.parent.is(":animated"))
+                helper.parent.stop().fadeTo(settings(current).fade, 1);
+            else
                 helper.parent.fadeIn(settings(current).fade);
-            else
-                helper.parent.stop();
         } else {
             helper.parent.show();
@@ -270 +270 @@
         
         var tsettings = settings(this);
-        if (tsettings.fade)
-            helper.parent.stop().fadeOut(tsettings.fade, function() {
-                helper.parent.removeClass( tsettings.extraClass ).css("opacity", "");
-            });
-        else
-            helper.parent.hide().removeClass( tsettings.extraClass );
+        function complete() {
+            helper.parent.removeClass( tsettings.extraClass )//.css("opacity", "");
+        }
+        if (tsettings.fade) {
+            if (helper.parent.is(':animated'))
+                helper.parent.stop().fadeTo(tsettings.fade, 0, complete);
+            else
+                helper.parent.stop().fadeOut(tsettings.fade, complete);
+        } else
+            complete();
         
         if( settings(this).fixPNG )