[Jifty-commit] r5716 - in jifty/trunk: share/web/static/js

[Jifty commits]

Author: alexmv
Date: Wed Aug 13 15:52:55 2008
New Revision: 5716

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/share/web/static/js/jifty.js

Log:
 r35911 at kohr-ah:  chmrr | 2008-08-13 15:52:46 -0400
  * It turns out you need to explicitly dequeue yourself from the jQuery event queue, or you block it forever.  Buh?


Modified: jifty/trunk/share/web/static/js/jifty.js
==============================================================================
--- jifty/trunk/share/web/static/js/jifty.js	(original)
+++ jifty/trunk/share/web/static/js/jifty.js	Wed Aug 13 15:52:55 2008
@@ -908,14 +908,20 @@
                     f['effect'],
                     f['effect_args']
                 );
-                jQuery(element).queue(function() { jQuery(element).remove(); });
+                jQuery(element).queue(function() {
+                    jQuery(element).remove();
+                    jQuery(element).dequeue();
+                });
             } else if (f['remove_effect']) {
                 Jifty.Effect(
                     Jifty.$('region-'+f['region']),
                     f['remove_effect'],
                     f['remove_effect_args']
                 );
-                jQuery(element).queue(function() { jQuery(element).remove(); });
+                jQuery(element).queue(function() {
+                    jQuery(element).remove();
+                    jQuery(element).dequeue();
+                });
             } else {
                 jQuery(element).remove();
             }
@@ -1049,7 +1055,10 @@
                         f['remove_effect'],
                         f['remove_effect_args']
                     );
-                    jQuery(element).queue(function() { jQuery(element).html( textContent ); });
+                    jQuery(element).queue(function() {
+                        jQuery(element).html( textContent );
+                        jQuery(element).dequeue();
+                    });
                 } else {
                     jQuery(element).html( textContent );
                 }
@@ -1639,13 +1648,13 @@
         name == 'SlideUp' ? 'slideUp' :
         name;
 
-    if (jQuery.isFunction( jQuery(el)[ effect ] ) ) {
-        if ( jQuery.isFunction(options["before"])  ) 
+    if ( jQuery.isFunction( jQuery(el)[ effect ] ) ) {
+        if ( jQuery.isFunction(options["before"]) ) 
             options["before"].call( el );
 
         ( jQuery(el)[ effect ] )(args);
 
-        if ( jQuery.isFunction(options["after"])  ) 
+        if ( jQuery.isFunction(options["after"]) ) 
             options["after"].call( el );
     }
 };