]> source.dussan.org Git - jquery-ui.git/commitdiff
Accordion: Fixed nested accordions.
authorScott González <scott.gonzalez@gmail.com>
Fri, 30 Sep 2011 21:06:06 +0000 (17:06 -0400)
committerScott González <scott.gonzalez@gmail.com>
Fri, 30 Sep 2011 21:06:22 +0000 (17:06 -0400)
ui/jquery.ui.accordion.js

index c976e3e69fab8a3ffeea9e90dd13da3686c40a87..580009d33a3f27612d60f3ee4907c64869ed3fc5 100644 (file)
@@ -13,8 +13,6 @@
  */
 (function( $, undefined ) {
                  
-var lastToggle = {};
-
 // TODO: use ui-accordion-header-active class and fix styling
 $.widget( "ui.accordion", {
        version: "@VERSION",
@@ -39,6 +37,7 @@ $.widget( "ui.accordion", {
                var self = this,
                        options = self.options;
 
+               self.lastToggle = {};
                self.element.addClass( "ui-accordion ui-widget ui-helper-reset" );
 
                self.headers = self.element.find( options.header )
@@ -378,10 +377,11 @@ $.widget( "ui.accordion", {
                        }
 
                        animations[ animation ]({
+                               widget: self,
                                toShow: toShow,
                                toHide: toHide,
-                               prevShow: lastToggle.toShow,
-                               prevHide: lastToggle.toHide,
+                               prevShow: self.lastToggle.toShow,
+                               prevHide: self.lastToggle.toHide,
                                complete: complete,
                                down: toShow.length && ( !toHide.length || ( toShow.index() < toHide.index() ) )
                        }, additional );
@@ -450,7 +450,7 @@ $.extend( $.ui.accordion, {
                                duration: 300
                        }, options, additions );
                        
-                       lastToggle = options;
+                       options.widget.lastToggle = options;
 
                        if ( !options.toHide.size() ) {
                                originalWidth = options.toShow[0].style.width;