From: MatmaRex <matma.rex@gmail.com>
Date: Wed, 4 Sep 2013 14:48:09 +0000 (+0200)
Subject: jquery.makeCollapsible: Only trigger custom events once per collapsible
X-Git-Tag: 1.31.0-rc.0~18797^2
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=b340bd4f6be3c90952ac7bcb0af2fd84c0cff900;p=lhc%2Fweb%2Fwiklou.git

jquery.makeCollapsible: Only trigger custom events once per collapsible

The callback to $.fn.animate()-family functions is fired once per animated
element, not once per call.

Use $.when instead, which behaves the way we need here.

Discovered when writing tests committed in I33b067a7.

Change-Id: I9d61a34374d42609d8d80206f4a4b315f76a8d8d
---

diff --git a/resources/jquery/jquery.makeCollapsible.js b/resources/jquery/jquery.makeCollapsible.js
index f5c204cdea..ac46092bf1 100644
--- a/resources/jquery/jquery.makeCollapsible.js
+++ b/resources/jquery/jquery.makeCollapsible.js
@@ -75,10 +75,10 @@
 					$containers.hide();
 					hookCallback();
 				} else {
-					$containers.stop( true, true ).fadeOut( hookCallback );
+					$.when( $containers.stop( true, true ).fadeOut() ).then( hookCallback );
 				}
 			} else {
-				$containers.stop( true, true ).fadeIn( hookCallback );
+				$.when( $containers.stop( true, true ).fadeIn() ).then( hookCallback );
 			}
 
 		} else if ( !options.plainMode && ( $collapsible.is( 'ul' ) || $collapsible.is( 'ol' ) ) ) {
@@ -94,10 +94,10 @@
 					$containers.hide();
 					hookCallback();
 				} else {
-					$containers.stop( true, true ).slideUp( hookCallback );
+					$.when( $containers.stop( true, true ).slideUp() ).then( hookCallback );
 				}
 			} else {
-				$containers.stop( true, true ).slideDown( hookCallback );
+				$.when( $containers.stop( true, true ).slideDown() ).then( hookCallback );
 			}
 
 		} else {
@@ -111,10 +111,10 @@
 						$collapsibleContent.hide();
 						hookCallback();
 					} else {
-						$collapsibleContent.slideUp( hookCallback );
+						$.when( $collapsibleContent.slideUp() ).then( hookCallback );
 					}
 				} else {
-					$collapsibleContent.slideDown( hookCallback );
+					$.when( $collapsibleContent.slideDown() ).then( hookCallback );
 				}
 
 			// Otherwise assume this is a customcollapse with a remote toggle
@@ -126,16 +126,16 @@
 						hookCallback();
 					} else {
 						if ( $collapsible.is( 'tr' ) || $collapsible.is( 'td' ) || $collapsible.is( 'th' ) ) {
-							$collapsible.fadeOut( hookCallback );
+							$.when( $collapsible.fadeOut() ).then( hookCallback );
 						} else {
-							$collapsible.slideUp( hookCallback );
+							$.when( $collapsible.slideUp() ).then( hookCallback );
 						}
 					}
 				} else {
 					if ( $collapsible.is( 'tr' ) || $collapsible.is( 'td' ) || $collapsible.is( 'th' ) ) {
-						$collapsible.fadeIn( hookCallback );
+						$.when( $collapsible.fadeIn() ).then( hookCallback );
 					} else {
-						$collapsible.slideDown( hookCallback );
+						$.when( $collapsible.slideDown() ).then( hookCallback );
 					}
 				}
 			}