diff options
-rw-r--r-- | tests/unit/accordion/accordion_events.js | 7 | ||||
-rw-r--r-- | ui/jquery.ui.accordion.js | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/tests/unit/accordion/accordion_events.js b/tests/unit/accordion/accordion_events.js index b67f2b26d..79283d11c 100644 --- a/tests/unit/accordion/accordion_events.js +++ b/tests/unit/accordion/accordion_events.js @@ -6,7 +6,7 @@ var setupTeardown = TestHelpers.accordion.setupTeardown, module( "accordion: events", setupTeardown() ); test( "create", function() { - expect( 10 ); + expect( 15 ); var element = $( "#list1" ), headers = element.children( "h3" ), @@ -16,6 +16,8 @@ test( "create", function() { create: function( event, ui ) { equal( ui.header.length, 1, "header length" ); strictEqual( ui.header[ 0 ], headers[ 0 ], "header" ); + equal( ui.panel.length, 1, "panel length" ); + strictEqual( ui.panel[ 0 ], contents[ 0 ], "panel" ); equal( ui.content.length, 1, "content length" ); strictEqual( ui.content[ 0 ], contents[ 0 ], "content" ); } @@ -27,6 +29,8 @@ test( "create", function() { create: function( event, ui ) { equal( ui.header.length, 1, "header length" ); strictEqual( ui.header[ 0 ], headers[ 2 ], "header" ); + equal( ui.panel.length, 1, "panel length" ); + strictEqual( ui.panel[ 0 ], contents[ 2 ], "panel" ); equal( ui.content.length, 1, "content length" ); strictEqual( ui.content[ 0 ], contents[ 2 ], "content" ); } @@ -38,6 +42,7 @@ test( "create", function() { collapsible: true, create: function( event, ui ) { equal( ui.header.length, 0, "header length" ); + equal( ui.panel.length, 0, "panel length" ); equal( ui.content.length, 0, "content length" ); } }); diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js index 8050e55ab..1afa95cb4 100644 --- a/ui/jquery.ui.accordion.js +++ b/ui/jquery.ui.accordion.js @@ -65,6 +65,7 @@ $.widget( "ui.accordion", { _getCreateEventData: function() { return { header: this.active, + panel: !this.active.length ? $() : this.active.next(), content: !this.active.length ? $() : this.active.next() }; }, @@ -262,8 +263,8 @@ $.widget( "ui.accordion", { (this.element.attr( "id" ) || ++uid); this.active = this._findActive( options.active ) - .addClass( "ui-accordion-header-active ui-state-active" ) - .toggleClass( "ui-corner-all ui-corner-top" ); + .addClass( "ui-accordion-header-active ui-state-active ui-corner-top" ) + .removeClass( "ui-corner-all" ); this.active.next() .addClass( "ui-accordion-content-active" ) .show(); |