From: Scott González <scott.gonzalez@gmail.com>
Date: Sat, 5 Feb 2011 04:50:49 +0000 (-0500)
Subject: Accordion: Reduced some code in _toggle().
X-Git-Tag: 1.9m4~21
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e986bd8877a3ebceb301ea015742bb5bec65a68d;p=jquery-ui.git

Accordion: Reduced some code in _toggle().
---

diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index ad96cfb91..61b1f2eb5 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -341,8 +341,7 @@ $.widget( "ui.accordion", {
 		var self = this,
 			options = self.options,
 			toShow = data.newContent,
-			toHide = data.oldContent,
-			down = toShow.length && ( !toHide.length || ( toShow.index() < toHide.index() ) );
+			toHide = data.oldContent;
 
 		self.running = true;
 		function complete() {
@@ -351,27 +350,24 @@ $.widget( "ui.accordion", {
 
 		if ( options.animated ) {
 			var animations = $.ui.accordion.animations,
-				easing = options.animated;
+				animation = options.animated,
+				additional;
 
-			if ( easing && !animations[ easing ] && !$.easing[ easing ] ) {
-				easing = "slide";
-			}
-			if ( !animations[ easing ] ) {
-				animations[ easing ] = function( options ) {
-					this.slide( options, {
-						easing: easing,
-						duration: 700
-					});
+			if ( !animations[ animation ] ) {
+				additional = {
+					easing: $.easing[ animation ] ? animation : "slide",
+					duration: 700
 				};
+				animation = "slide";
 			}
 
-			animations[ easing ]({
+			animations[ animation ]({
 				toShow: toShow,
 				toHide: toHide,
 				complete: complete,
-				down: down,
+				down: toShow.length && ( !toHide.length || ( toShow.index() < toHide.index() ) ),
 				autoHeight: options.heightStyle !== "content"
-			});
+			}, additional );
 		} else {
 			toHide.hide();
 			toShow.show();