r2516 - Fix for #4222
Author: joern.zaefferer
Date: Mon May 11 04:43:48 2009
New Revision: 2516
Modified:
trunk/demos/accordion/custom-icons.html
trunk/tests/unit/accordion/accordion_options.js
trunk/themes/base/ui.accordion.css
trunk/ui/ui.accordion.js
Log:
Fix for #4222
Modified: trunk/demos/accordion/custom-icons.html
==============================================================================
--- trunk/demos/accordion/custom-icons.html (original)
+++ trunk/demos/accordion/custom-icons.html Mon May 11 04:43:48 2009
@@ -9,11 +9,17 @@
<link type="text/css" href="../demos.css" rel="stylesheet" />
<script type="text/javascript">
$(function() {
+ var icons = {
+ header: "ui-icon-circle-arrow-e",
+ headerSelected: "ui-icon-circle-arrow-s"
+ };
$("#accordion").accordion({
- icons: {
- header: "ui-icon-circle-arrow-e",
- headerSelected: "ui-icon-circle-arrow-s"
- }
+ icons: icons
+ });
+ $("#toggle").toggle(function() {
+ $("#accordion").accordion("option", "icons", false);
+ }, function() {
+ $("#accordion").accordion("option", "icons", icons);
});
});
</script>
@@ -45,6 +51,8 @@
Cras dictum. Pellentesque habitant morbi tristique senectus et netus
et malesuada fames ac turpis egestas. Vestibulum ante ipsum primis in
faucibus orci luctus et ultrices posuere cubilia Curae; Aenean lacinia
mauris vel est.
Suspendisse eu nisl. Nullam ut libero. Integer
dignissim consequat lectus. Class aptent taciti sociosqu ad litora torquent
per conubia nostra, per inceptos himenaeos.
</div>
</div>
+
+<button id="toggle">Toggle icons</button>
</div><!-- End demo -->
Modified: trunk/tests/unit/accordion/accordion_options.js
==============================================================================
--- trunk/tests/unit/accordion/accordion_options.js (original)
+++ trunk/tests/unit/accordion/accordion_options.js Mon May 11 04:43:48 2009
@@ -119,6 +119,23 @@
ok(false, 'missing test - untested code is broken code');
});
+test("{ icons: false }", function() {
+ function icons(on) {
+ same($("#list1 span.ui-icon:visible").length, on ? 3 : 0);
+ same( $("#list1").hasClass("ui-accordion-icons"), on );
+ }
+ $("#list1").accordion();
+ icons(true);
+ $("#list1").accordion("destroy").accordion({
+ icons: false
+ });
+ icons(false);
+ $("#list1").accordion("option", "icons", $.ui.accordion.defaults.icons);
+ icons(true);
+ $("#list1").accordion("option", "icons", false);
+ icons(false);
+});
+
test("{ navigation: false }, default", function() {
ok(false, 'missing test - untested code is broken code');
});
Modified: trunk/themes/base/ui.accordion.css
==============================================================================
--- trunk/themes/base/ui.accordion.css (original)
+++ trunk/themes/base/ui.accordion.css Mon May 11 04:43:48 2009
@@ -3,7 +3,8 @@
.ui-accordion .ui-accordion-header { cursor: pointer; position: relative;
margin-top: 1px; zoom: 1; }
.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 a { display: block; font-size: 1em;
padding: .5em .5em .5em .7em; }
+.ui-accordion-icons .ui-accordion-header a { padding-left: 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; }
Modified: trunk/ui/ui.accordion.js
==============================================================================
--- trunk/ui/ui.accordion.js (original)
+++ trunk/ui/ui.accordion.js Mon May 11 04:43:48 2009
@@ -60,8 +60,7 @@
this.active.next().addClass('ui-accordion-content-active');
//Append icon elements
- $("<span/>").addClass("ui-icon " +
o.icons.header).prependTo(this.headers);
-
this.active.find(".ui-icon").toggleClass(o.icons.header).toggleClass(o.icons.headerSelected);
+ this._createIcons();
// IE7-/Win - Extra vertical space in lists fixed
if ($.browser.msie) {
@@ -104,6 +103,20 @@
}
},
+
+ _createIcons: function() {
+ var o = this.options;
+ if (o.icons) {
+ $("<span/>").addClass("ui-icon " +
o.icons.header).prependTo(this.headers);
+
this.active.find(".ui-icon").toggleClass(o.icons.header).toggleClass(o.icons.headerSelected);
+ this.element.addClass("ui-accordion-icons");
+ }
+ },
+
+ _destroyIcons: function() {
+ this.headers.children(".ui-icon").remove();
+ this.element.removeClass("ui-accordion-icons");
+ },
destroy: function() {
var o = this.options;
@@ -120,7 +133,7 @@
.removeAttr("role").removeAttr("aria-expanded").removeAttr("tabindex");
this.headers.find("a").removeAttr("tabindex");
- this.headers.children(".ui-icon").remove();
+ this._destroyIcons();
var contents =
this.headers.next().css("display", "").removeAttr("role").removeClass("ui-helper-reset
ui-widget-content ui-corner-bottom ui-accordion-content
ui-accordion-content-active");
if (o.autoHeight || o.fillHeight) {
contents.css("height", "");
@@ -130,8 +143,18 @@
},
_setData: function(key, value) {
- if(key == 'alwaysOpen') { key = 'collapsible'; value = !value; }
- $.widget.prototype._setData.apply(this, arguments);
+ // alwaysOpen is deprecated
+ if(key == 'alwaysOpen'){ key = 'collapsible'; value = !value; }
+
+ $.widget.prototype._setData.apply(this, arguments);
+
+ if (key == "icons") {
+ this._destroyIcons();
+ if (value) {
+ this._createIcons();
+ }
+ }
+
},
_keydown: function(event) {
Topic Participants
Richard Worth