Changeset 5188
- Timestamp:
- 04/03/08 18:05:08 (9 months ago)
- Location:
- trunk/ui
- Files:
-
- 2 modified
-
demos/ui.accordion.html (modified) (2 diffs)
-
ui.accordion.js (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ui/demos/ui.accordion.html
r5149 r5188 25 25 <div class="playground"> 26 26 27 <ul id="example1" class="ui-accordion-container"style="width: 200px;">27 <ul id="example1" style="width: 200px;"> 28 28 <li> 29 <span class="ui-accordion-left"></span> 30 <a href='#' class="ui-accordion-link"> 29 <a href='#'> 31 30 Test 1 32 <span class="ui-accordion-right"></span>33 31 </a> 34 32 <div>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. … … 36 34 </li> 37 35 <li> 38 <span class="ui-accordion-left"></span> 39 <a href='#' class="ui-accordion-link">Test 2<span class="ui-accordion-right"></span></a> 36 <a href='#'>Test 2</a> 40 37 <div>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. 41 38 </div> 42 39 </li> 43 40 <li> 44 <span class="ui-accordion-left"></span> 45 <a href='#' class="ui-accordion-link">Test 3<span class="ui-accordion-right"></span></a> 41 <a href='#'>Test 3</a> 46 42 <div>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. 47 43 </div> -
trunk/ui/ui.accordion.js
r5149 r5188 33 33 // setup configuration 34 34 this.options = options = $.extend({}, $.ui.accordion.defaults, options); 35 this.element = container; 36 37 $(container).addClass("ui-accordion"); 35 this.element = $(container); 38 36 39 37 if ( options.navigation ) { 40 var current = $(container).find("a").filter(options.navigationFilter);38 var current = this.element.find("a").filter(options.navigationFilter); 41 39 if ( current.length ) { 42 40 if ( current.filter(options.header).length ) { … … 50 48 51 49 // calculate active if not specified, using the first header 52 options.headers = $(container).find(options.header);50 options.headers = this.element.find(options.header); 53 51 options.active = findActive(options.headers, options.active); 52 53 if (!this.element.hasClass("ui-accordion")) { 54 this.element.addClass("ui-accordion"); 55 $("<span class='ui-accordion-left'/>").insertBefore(options.headers); 56 $("<span class='ui-accordion-right'/>").appendTo(options.headers); 57 options.headers.addClass("ui-accordion-header").attr("tabindex", "0"); 58 } 54 59 55 60 if ( options.fillSpace ) { 56 var maxHeight = $(container).parent().height();61 var maxHeight = this.element.parent().height(); 57 62 options.headers.each(function() { 58 63 maxHeight -= $(this).outerHeight(); … … 76 81 77 82 if (options.event) 78 $(container).bind((options.event) + ".accordion", clickHandler);83 this.element.bind((options.event) + ".accordion", clickHandler); 79 84 }; 80 85 … … 82 87 activate: function(index) { 83 88 // call clickHandler with custom event 84 clickHandler.call(this.element , {89 clickHandler.call(this.element[0], { 85 90 target: findActive( this.options.headers, index )[0] 86 91 }); … … 98 103 this.options.headers.next().css("height", ""); 99 104 } 100 $.removeData(this.element , "accordion");101 $(this.element).removeClass("ui-accordion").unbind(".accordion");105 $.removeData(this.element[0], "accordion"); 106 this.element.removeClass("ui-accordion").unbind(".accordion"); 102 107 } 103 108 };