]> source.dussan.org Git - jquery-ui.git/commitdiff
projects / jquery-ui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1322a98)
accordion: added ul-visual-test; improved solution for fixing ul-accordions, no more...
authorJörn Zaefferer <joern.zaefferer@gmail.com>
Fri, 30 Jan 2009 20:42:03 +0000 (20:42 +0000)
committerJörn Zaefferer <joern.zaefferer@gmail.com>
Fri, 30 Jan 2009 20:42:03 +0000 (20:42 +0000)
demos/accordion/noAutoHeight.html patch | blob | history
tests/visual/accordion/ul.html [new file with mode: 0644] patch | blob
themes/base/ui.accordion.css patch | blob | history
ui/ui.accordion.js patch | blob | history

diff --git a/demos/accordion/noAutoHeight.html b/demos/accordion/noAutoHeight.html
index 8f976e347d4c0213f3de47fa26f7885f2d9f8378..b20ee6e8096cd35987bf34da82705a7b3d667e51 100644 (file)
--- a/demos/accordion/noAutoHeight.html
+++ b/demos/accordion/noAutoHeight.html
@@ -30,9 +30,6 @@
        </div>\r
        <h3><a href="#">Section 3</a></h3>\r
        <div>\r
-               <p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>\r
-               <p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>\r
-               <p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>\r
                <p>Nam enim risus, molestie et, porta ac, aliquam ac, risus. Quisque lobortis. Phasellus pellentesque purus in massa. Aenean in pede. Phasellus ac libero ac tellus pellentesque semper. Sed ac felis. Sed commodo, magna quis lacinia ornare, quam ante aliquam nisi, eu iaculis leo purus venenatis dui. </p>\r
                <ul>\r
                        <li>List item</li>\r
diff --git a/tests/visual/accordion/ul.html b/tests/visual/accordion/ul.html
new file mode 100644 (file)
index 0000000..9ba4782
--- /dev/null
+++ b/tests/visual/accordion/ul.html
@@ -0,0 +1,45 @@
+<!doctype html>\r
+<html>\r
+    <head>\r
+        <title>Accordion Visual Test : UL</title>\r
+        <link rel="stylesheet" href="../../static/static.css" type="text/css" />\r
+        <link rel="stylesheet" href="../../../themes/base/ui.base.css" type="text/css" />\r
+        <link rel="stylesheet" href="../../../themes/base/ui.theme.css" type="text/css" title="ui-theme" />\r
+        <script type="text/javascript" src="../../../jquery-1.3.1.js"></script>\r
+        <script type="text/javascript" src="../../../ui/ui.core.js"></script>\r
+        <script type="text/javascript" src="../../../ui/ui.accordion.js"></script>\r
+        <script type="text/javascript">\r
+            $(function(){\r
+                $("#accordion").accordion()\r
+            });\r
+        </script>\r
+    </head>\r
+    <body>\r
+        <ul id="accordion">\r
+            <li>\r
+                <h2>\r
+                    <a href="#">Accordion Header 1</a>\r
+                </h2>\r
+                <div>\r
+                       Accordion Content 1\r
+                                       <ul>\r
+                                               <li>Some list item</li>\r
+                                               <li>Some list item</li>\r
+                                       </ul>\r
+                               </div>\r
+            </li>\r
+            <li>\r
+                <h2>\r
+                    <a href="#">Accordion Header 2</a>\r
+                </h2>\r
+                <div>Accordion Content 2</div>\r
+            </li>\r
+            <li>\r
+                <h2>\r
+                    <a href="#">Accordion Header 3</a>\r
+                </h2>\r
+                <div>Accordion Content 2</div>\r
+            </li>\r
+        </ul>\r
+    </body>\r
+</html>\r
diff --git a/themes/base/ui.accordion.css b/themes/base/ui.accordion.css
index 305e8a7dee341c637f23f97401187e7e33c23cba..ee1b1b640b1514f8e124f61d70edc1ccd4cc27d4 100644 (file)
--- a/themes/base/ui.accordion.css
+++ b/themes/base/ui.accordion.css
@@ -1,8 +1,7 @@
 /* Accordion
 ----------------------------------*/
 .ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
-.ui-accordion li {display: inline;}
-.ui-accordion .ui-accordion-content li {display: list-item;}
+.ui-accordion .ui-accordion-li-fix { 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; }
diff --git a/ui/ui.accordion.js b/ui/ui.accordion.js
index da1712dccd1761e5d83bbd25383bf5a8e8a08a4b..659cd4a5e37eb9f249e56205bd616cc0b5100958 100644 (file)
--- a/ui/ui.accordion.js
+++ b/ui/ui.accordion.js
@@ -32,6 +32,11 @@ $.widget("ui.accordion", {
                }
 
                this.element.addClass("ui-accordion ui-widget ui-helper-reset");
+               
+               // in lack of child-selectors in CSS we need to mark top-LIs in a UL-accordion for some IE-fix
+               if (this.element[0].nodeName == "UL") {
+                       this.element.children("li").addClass("ui-accordion-li-fix");
+               }
 
                this.headers = this.element.find(o.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all")
                        .bind("mouseenter.accordion", function(){ $(this).addClass('ui-state-hover'); })
@@ -369,7 +374,7 @@ $.extend($.ui.accordion, {
                clearStyle: false,
                event: "click",
                fillSpace: false,
-               header: "> li :first,> :not(li):even",
+               header: "> li > :first-child,> :not(li):even",
                icons: {
                        header: "ui-icon-triangle-1-e",
                        headerSelected: "ui-icon-triangle-1-s"
The official jQuery user interface library: https://github.com/jquery/jquery-ui