aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2009-01-30 02:35:37 +0000
committerScott González <scott.gonzalez@gmail.com>2009-01-30 02:35:37 +0000
commit2c1d4675a8e5424861db3d797e5fa38760c0a872 (patch)
tree40a1845d00059c29434c1af3dff0ef2499a0b51b /tests
parent1631cf4ba3615ac6b61a3bf298c7132081dc28ea (diff)
downloadjquery-ui-2c1d4675a8e5424861db3d797e5fa38760c0a872.tar.gz
jquery-ui-2c1d4675a8e5424861db3d797e5fa38760c0a872.zip
Accordion: Fixed #3788: Removed wrapper divs and smoothed animations, allowing accordions to work with dl's and ul's again.
Diffstat (limited to 'tests')
-rw-r--r--tests/static/accordion/default.html11
-rw-r--r--tests/static/accordion/dl.html11
-rw-r--r--tests/static/accordion/ul.html11
-rw-r--r--tests/unit/accordion/accordion.js4
-rw-r--r--tests/visual/accordion/accordion.html20
-rw-r--r--tests/visual/accordion/default.html18
-rw-r--r--tests/visual/accordion/dl.html43
7 files changed, 58 insertions, 60 deletions
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 @@
<link rel="stylesheet" href="../../../themes/base/ui.theme.css" type="text/css" title="ui-theme" />
<script type="text/javascript" src="../../../jquery-1.3.1.js"></script>
<script type="text/javascript" src="../static.js"></script>
- <style type="text/css">
- /* Accordion
- ----------------------------------*/
- .ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
- .ui-accordion li {display: inline;}
- .ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
- .ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; }
- .ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
- .ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; }
- .ui-accordion .ui-accordion-content-active { display: block; }
- </style>
</head>
<body>
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 @@
<link rel="stylesheet" href="../../../themes/base/ui.theme.css" type="text/css" title="ui-theme" />
<script type="text/javascript" src="../../../jquery-1.3.1.js"></script>
<script type="text/javascript" src="../static.js"></script>
- <style type="text/css">
- /* Accordion
- ----------------------------------*/
- .ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
- .ui-accordion li {display: inline;}
- .ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
- .ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; }
- .ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
- .ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; }
- .ui-accordion .ui-accordion-content-active { display: block; }
- </style>
</head>
<body>
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 @@
<link rel="stylesheet" href="../../../themes/base/ui.theme.css" type="text/css" title="ui-theme" />
<script type="text/javascript" src="../../../jquery-1.3.1.js"></script>
<script type="text/javascript" src="../static.js"></script>
- <style type="text/css">
- /* Accordion
- ----------------------------------*/
- .ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
- .ui-accordion li {display: inline;}
- .ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
- .ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em 2.2em; }
- .ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
- .ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; }
- .ui-accordion .ui-accordion-content-active { display: block; }
- </style>
</head>
<body>
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();
- })
+ });
</script>
</head>
<body>
@@ -25,23 +25,17 @@
<li class="plugin">
Accordion
<div id="accordion">
+ <h3><a href="#">First</a></h3>
<div>
- <h3><a href="#">First</a></h3>
- <div>
- Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.
- </div>
+ Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet.
</div>
+ <h3><a href="#">Second</a></h3>
<div>
- <h3><a href="#">Second</a></h3>
- <div>
- Phasellus mattis tincidunt nibh.
- </div>
+ Phasellus mattis tincidunt nibh.
</div>
+ <h3><a href="#">Third</a></h3>
<div>
- <h3><a href="#">Third</a></h3>
- <div>
- Nam dui erat, auctor a, dignissim quis.
- </div>
+ Nam dui erat, auctor a, dignissim quis.
</div>
</div>
<button id="toggle">Toggle</button>
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 @@
<body>
<div id="accordion">
+ <h3><a href="#">Accordion Header 1</a></h3>
<div>
- <h3><a href="#">Accordion Header 1</a></h3>
- <div>
- Accordion Content 1
- </div>
+ Accordion Content 1
</div>
+ <h3><a href="#">Accordion Header 2</a></h3>
<div>
- <h3><a href="#">Accordion Header 2</a></h3>
- <div>
- Accordion Content 2
- </div>
+ Accordion Content 2
</div>
+ <h3><a href="#">Accordion Header 3</a></h3>
<div>
- <h3><a href="#">Accordion Header 3</a></h3>
- <div>
- Accordion Content 3
- </div>
+ Accordion Content 3
</div>
</div>
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 @@
+<!doctype html>
+<html>
+<head>
+ <title>Accordion Static Test : DL</title>
+ <link rel="stylesheet" href="../../static/static.css" type="text/css" />
+ <link rel="stylesheet" href="../../../themes/base/ui.base.css" type="text/css" />
+ <link rel="stylesheet" href="../../../themes/base/ui.theme.css" type="text/css" title="ui-theme" />
+ <script type="text/javascript" src="../../../jquery-1.3.1.js"></script>
+ <script type="text/javascript" src="../../../ui/ui.core.js"></script>
+ <script type="text/javascript" src="../../../ui/ui.accordion.js"></script>
+ <script type="text/javascript">
+ $(function() {
+ $("dl").accordion({
+ header: "dt"
+ })
+ });
+ </script>
+</head>
+<body>
+
+<dl>
+ <dt>
+ <a href="#">Accordion Header 1</a>
+ </dt>
+ <dd>
+ Accordion Content 1
+ </dd>
+ <dt>
+ <a href="#">Accordion Header 2</a>
+ </dt>
+ <dd>
+ Accordion Content 2
+ </dd>
+ <dt>
+ <a href="#">Accordion Header 3</a>
+ </dt>
+ <dd>
+ Accordion Content 2
+ </dd>
+</dl>
+
+</body>
+</html>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 12:51:32 +0000