Accordion: Fixed #3969: Deprecated alwaysOpen for collapsible option; fixed demos...

diff --git a/demos/accordion/collapsible.html b/demos/accordion/collapsible.html
index a4e3a31aedd3c245042e5b45fbf9741fd3b3cae8..6520b152ac3ec6e684f90b034275537aa65b1ddc 100644 (file)
--- a/demos/accordion/collapsible.html
+++ b/demos/accordion/collapsible.html
@@ -10,7 +10,7 @@
        <script type="text/javascript">
        $(function() {
                $("#accordion").accordion({
-                       alwaysOpen: false
+                       collapsible: true
                });
        });
        </script>
@@ -49,7 +49,7 @@
 
 <div class="demo-description">
 
-<p>By default, accordions always keep one section open. To allow for all sections to be be collapsible, set the <code>alwaysOpen</code> option to false. Click on the currently open section to collapse its content pane.</p>
+<p>By default, accordions always keep one section open. To allow for all sections to be be collapsible, set the <code>collapsible</code> option to true. Click on the currently open section to collapse its content pane.</p>
 
 
 </div><!-- End demo-description -->

diff --git a/tests/unit/accordion/accordion.js b/tests/unit/accordion/accordion.js
index 8755f75aff01ac4ef994efa27db5d89c2c9694db..5fa7845efd6c6a8556c97a81882116e65ba2aab2 100644 (file)
--- a/tests/unit/accordion/accordion.js
+++ b/tests/unit/accordion/accordion.js
@@ -48,8 +48,8 @@ test("activate, numeric", function() {
        state(ac, 0, 0, 1);
 });
 
-test("activate, boolean and numeric, alwaysOpen:false", function() {
-       var ac = $('#list1').accordion({alwaysOpen: false}).accordion("activate", 2);
+test("activate, boolean and numeric, collapsible:true", function() {
+       var ac = $('#list1').accordion({collapsible: true}).accordion("activate", 2);
        state(ac, 0, 0, 1);
        ok("x", "----");
        ac.accordion("activate", 0);
@@ -59,7 +59,7 @@ test("activate, boolean and numeric, alwaysOpen:false", function() {
        state(ac, 0, 0, 0);
 });
 
-test("activate, boolean, alwaysOpen:true", function() {
+test("activate, boolean, collapsible:false", function() {
        var ac = $('#list1').accordion().accordion("activate", 2);
        state(ac, 0, 0, 1);
        ac.accordion("activate", -1);
@@ -102,7 +102,7 @@ test("handle click on header-descendant", function() {
 test("active:false", function() {
        $("#list1").accordion({
                active: false,
-               alwaysOpen: false
+               collapsible: true
        });
        equals( $("#list1 a.selected").size(), 0, "no headers selected" );
 });
@@ -111,7 +111,7 @@ test("accordionchange event, open closed and close again", function() {
        expect(8);
        $("#list1").accordion({
                active: false,
-               alwaysOpen: false
+               collapsible: true
        })
        .one("accordionchange", function(event, ui) {
                equals( ui.oldHeader.size(), 0 );

diff --git a/ui/ui.accordion.js b/ui/ui.accordion.js
index c9330f64c27fbecf33e25b8e13fdb5630ca65ac0..de0ef00fdbb5eb5da62d059e2e19e0f321659fb5 100644 (file)
--- a/ui/ui.accordion.js
+++ b/ui/ui.accordion.js
@@ -19,6 +19,14 @@ $.widget("ui.accordion", {
                var o = this.options, self = this;
                this.running = 0;
 
+               // if the user set the alwaysOpen option on init
+               // then we need to set the collapsible option
+               // if they set both on init, collapsible will take priority
+               if (o.collapsible == $.ui.accordion.defaults.collapsible &&
+                       o.alwaysOpen != $.ui.accordion.defaults.alwaysOpen) {
+                       o.collapsible = !o.alwaysOpen;
+               }
+
                if ( o.navigation ) {
                        var current = this.element.find("a").filter(o.navigationFilter);
                        if ( current.length ) {
@@ -377,9 +385,9 @@ $.extend($.ui.accordion, {
                active: null,
                autoHeight: true,
                alwaysOpen: true, //deprecated, use collapsible
-               collapsible: false,
                animated: 'slide',
                clearStyle: false,
+               collapsible: false,
                event: "click",
                fillSpace: false,
                header: "> li > :first-child,> :not(li):even",