From 2c1d4675a8e5424861db3d797e5fa38760c0a872 Mon Sep 17 00:00:00 2001 From: Scott González Date: Fri, 30 Jan 2009 02:35:37 +0000 Subject: Accordion: Fixed #3788: Removed wrapper divs and smoothed animations, allowing accordions to work with dl's and ul's again. --- tests/static/accordion/default.html | 11 --------- tests/static/accordion/dl.html | 11 --------- tests/static/accordion/ul.html | 11 --------- tests/unit/accordion/accordion.js | 4 ++-- tests/visual/accordion/accordion.html | 20 ++++++---------- tests/visual/accordion/default.html | 18 +++++---------- tests/visual/accordion/dl.html | 43 +++++++++++++++++++++++++++++++++++ 7 files changed, 58 insertions(+), 60 deletions(-) create mode 100644 tests/visual/accordion/dl.html (limited to 'tests') diff --git a/tests/static/accordion/default.html b/tests/static/accordion/default.html index 64d8e76c0..1dbfde4b6 100644 --- a/tests/static/accordion/default.html +++ b/tests/static/accordion/default.html @@ -7,17 +7,6 @@ - diff --git a/tests/static/accordion/dl.html b/tests/static/accordion/dl.html index f53eab857..dff8407d9 100644 --- a/tests/static/accordion/dl.html +++ b/tests/static/accordion/dl.html @@ -7,17 +7,6 @@ - diff --git a/tests/static/accordion/ul.html b/tests/static/accordion/ul.html index 8aae67134..84c3c37df 100644 --- a/tests/static/accordion/ul.html +++ b/tests/static/accordion/ul.html @@ -7,17 +7,6 @@ - diff --git a/tests/unit/accordion/accordion.js b/tests/unit/accordion/accordion.js index d9f8c4b64..e39469827 100644 --- a/tests/unit/accordion/accordion.js +++ b/tests/unit/accordion/accordion.js @@ -10,13 +10,13 @@ jQuery.ui.accordion.defaults.animated = false; function state(accordion) { var args = $.makeArray(arguments).slice(1); $.each(args, function(i, n) { - equals(accordion.find(".ui-accordion-content").parent().eq(i).is(":visible"), n); + equals(accordion.find(".ui-accordion-content").eq(i).is(":visible"), n); }); } $.fn.triggerEvent = function(type, target) { return this.triggerHandler(type, [jQuery.event.fix({ type: type, target: target })]); -} +}; test("basics", function() { state($('#list1').accordion(), 1, 0, 0); diff --git a/tests/visual/accordion/accordion.html b/tests/visual/accordion/accordion.html index fd467dc27..b5322391a 100644 --- a/tests/visual/accordion/accordion.html +++ b/tests/visual/accordion/accordion.html @@ -16,7 +16,7 @@ $("#accordion").accordion("destroy"); } $("#toggle").toggle(on, off).click(); - }) + }); @@ -25,23 +25,17 @@
  • Accordion
    +

    First

    -

    First

    -
    - Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet. -
    + Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.
    +

    Second

    -

    Second

    -
    - Phasellus mattis tincidunt nibh. -
    + Phasellus mattis tincidunt nibh.
    +

    Third

    -

    Third

    -
    - Nam dui erat, auctor a, dignissim quis. -
    + Nam dui erat, auctor a, dignissim quis.
    diff --git a/tests/visual/accordion/default.html b/tests/visual/accordion/default.html index d8b94dc63..1aacc1b59 100644 --- a/tests/visual/accordion/default.html +++ b/tests/visual/accordion/default.html @@ -16,23 +16,17 @@
    +

    Accordion Header 1

    -

    Accordion Header 1

    -
    - Accordion Content 1 -
    + Accordion Content 1
    +

    Accordion Header 2

    -

    Accordion Header 2

    -
    - Accordion Content 2 -
    + Accordion Content 2
    +

    Accordion Header 3

    -

    Accordion Header 3

    -
    - Accordion Content 3 -
    + Accordion Content 3
    diff --git a/tests/visual/accordion/dl.html b/tests/visual/accordion/dl.html new file mode 100644 index 000000000..9bc8886e8 --- /dev/null +++ b/tests/visual/accordion/dl.html @@ -0,0 +1,43 @@ + + + + Accordion Static Test : DL + + + + + + + + + + +
    +
    + Accordion Header 1 +
    +
    + Accordion Content 1 +
    +
    + Accordion Header 2 +
    +
    + Accordion Content 2 +
    +
    + Accordion Header 3 +
    +
    + Accordion Content 2 +
    +
    + + + -- cgit v1.2.3