Changeset 5143
- Timestamp:
- 03/29/08 14:40:12 (8 months ago)
- Location:
- trunk/ui
- Files:
-
- 114 modified
-
colorpicker/colorpicker.html (modified) (1 prop)
-
colorpicker/pngFix/jquery.pngFix.js (modified) (1 prop)
-
colorpicker/ui.colorpicker.css (modified) (1 prop)
-
colorpicker/ui.colorpicker.js (modified) (1 prop)
-
datepicker/compatibility/index-2.7.html (modified) (1 prop)
-
datepicker/compatibility/index-3.2.html (modified) (1 prop)
-
datepicker/compatibility/index-3.3.html (modified) (1 prop)
-
datepicker/compatibility/jquery-calendar-compatibility.js (modified) (1 prop)
-
datepicker/compatibility/jquery-calendar-demo.css (modified) (1 prop)
-
datepicker/compatibility/jquery-calendar-demo.js (modified) (1 prop)
-
datepicker/compatibility/ui.datepicker.compatibility-3.2.js (modified) (1 prop)
-
datepicker/compatibility/ui.datepicker.compatibility-3.3.js (modified) (1 prop)
-
datepicker/compatibility/ui.datepicker.demo-3.2.js (modified) (1 prop)
-
datepicker/compatibility/ui.datepicker.demo-3.3.js (modified) (1 prop)
-
datepicker/core/index.html (modified) (1 prop)
-
datepicker/core/jquery.js (modified) (1 prop)
-
datepicker/core/ui.datepicker.css (modified) (1 prop)
-
datepicker/core/ui.datepicker.js (modified) (1 prop)
-
datepicker/demo/jquery.localisation.js (modified) (1 prop)
-
datepicker/demo/ui.datepicker.alt.css (modified) (1 prop)
-
datepicker/demo/ui.datepicker.demo.css (modified) (1 prop)
-
datepicker/demo/ui.datepicker.demo.js (modified) (1 prop)
-
datepicker/extras/thickbox-datepicker/index.html (modified) (1 prop)
-
datepicker/extras/thickbox-datepicker/thickbox.css (modified) (1 prop)
-
datepicker/extras/thickbox-datepicker/thickbox.js (modified) (1 prop)
-
datepicker/extras/ui.datepicker.ent (modified) (1 prop)
-
datepicker/extras/ui.datepicker.extras.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-ca.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-cs.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-da.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-de.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-es.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-fi.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-fr.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-he.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-hu.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-is.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-it.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-ja.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-ko.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-lt.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-nl.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-no.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-pl.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-pt-BR.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-ro.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-ru.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-sk.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-sv.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-th.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-tr.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-zh-CN.js (modified) (1 prop)
-
datepicker/i18n/ui.datepicker-zh-TW.js (modified) (1 prop)
-
datepicker/index.html (modified) (1 prop)
-
datepicker/test/jsUnitCore.js (modified) (1 prop)
-
datepicker/test/ui.datepicker.jsunit.tests.html (modified) (1 prop)
-
datepicker/test/ui.datepicker.tests.html (modified) (1 prop)
-
demos/css/style.css (modified) (1 prop)
-
demos/functional/ui.accordion.html (modified) (1 prop)
-
demos/functional/ui.draggable.html (modified) (1 prop)
-
demos/functional/ui.tabs.php (modified) (1 prop)
-
demos/real-world/accordion-drawers/index.html (modified) (1 prop)
-
demos/real-world/layout/demo.css (modified) (1 prop)
-
demos/real-world/layout/demo.js (modified) (1 prop)
-
demos/real-world/layout/index.html (modified) (1 prop)
-
demos/real-world/photo-manager/index.html (modified) (1 prop)
-
demos/real-world/photo-manager/js/demo.js (modified) (1 prop)
-
demos/real-world/photo-manager/theme/css/screen.css (modified) (1 prop)
-
demos/real-world/product-slider/index.html (modified) (1 prop)
-
demos/ui.accordion.html (modified) (1 prop)
-
demos/ui.datepicker.html (modified) (1 prop)
-
demos/ui.dialog.html (modified) (1 prop)
-
demos/ui.draggable.html (modified) (1 prop)
-
demos/ui.droppable.html (modified) (1 prop)
-
demos/ui.resizable.html (modified) (1 prop)
-
demos/ui.selectable.html (modified) (1 prop)
-
demos/ui.slider.html (modified) (1 prop)
-
demos/ui.sortable.boxes.html (modified) (1 prop)
-
demos/ui.sortable.html (modified) (1 prop)
-
demos/ui.tablesorter.html (modified) (1 prop)
-
demos/ui.tabs.ahah.html (modified) (1 prop)
-
demos/ui.tabs.html (modified) (1 prop)
-
demos/ui.themes.html (modified) (1 prop)
-
tests/dimensions.html (modified) (1 prop)
-
tests/droppable_trigger.html (modified) (1 prop)
-
tests/history.html (modified) (1 prop)
-
tests/slider_test.js (modified) (1 prop)
-
tests/sortable_draggable.html (modified) (1 prop)
-
tests/sortable_droponempty_events.html (modified) (1 prop)
-
tests/sortable_droppable.html (modified) (1 prop)
-
tests/uiTest.accordion.html (modified) (1 prop)
-
tests/uiTest.accordion.js (modified) (1 prop)
-
tests/uiTest.resizables.html (modified) (1 prop)
-
tests/uiTest.resizables.js (modified) (1 prop)
-
tests/uiTest.selectable.html (modified) (1 prop)
-
tests/uiTest.selectable.js (modified) (1 prop)
-
tests/uiTest.slider.html (modified) (1 prop)
-
tests/uiTest.slider.js (modified) (1 prop)
-
ui.accordion.js (modified) (2 diffs)
-
ui.base.js (modified) (2 diffs, 2 props)
-
ui.dialog.js (modified) (2 diffs, 1 prop)
-
ui.draggable.ext.js (modified) (14 diffs, 1 prop)
-
ui.draggable.js (modified) (1 diff, 1 prop)
-
ui.droppable.ext.js (modified) (2 diffs, 1 prop)
-
ui.droppable.js (modified) (2 diffs, 1 prop)
-
ui.history.js (modified) (3 diffs, 2 props)
-
ui.resizable.ext.js (modified) (1 diff, 1 prop)
-
ui.resizable.js (modified) (1 diff, 1 prop)
-
ui.selectable.js (modified) (1 diff, 1 prop)
-
ui.slider.js (modified) (1 diff)
-
ui.sortable.ext.js (modified) (9 diffs, 1 prop)
-
ui.sortable.js (modified) (1 diff, 1 prop)
-
ui.tabs.ext.js (modified) (2 diffs, 1 prop)
-
ui.tabs.js (modified) (2 diffs, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ui/colorpicker/colorpicker.html
- Property svn:eol-style set to native
-
trunk/ui/colorpicker/pngFix/jquery.pngFix.js
- Property svn:eol-style set to native
-
trunk/ui/colorpicker/ui.colorpicker.css
- Property svn:eol-style set to native
-
trunk/ui/colorpicker/ui.colorpicker.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/compatibility/index-2.7.html
- Property svn:eol-style set to native
-
trunk/ui/datepicker/compatibility/index-3.2.html
- Property svn:eol-style set to native
-
trunk/ui/datepicker/compatibility/index-3.3.html
- Property svn:eol-style set to native
-
trunk/ui/datepicker/compatibility/jquery-calendar-compatibility.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/compatibility/jquery-calendar-demo.css
- Property svn:eol-style set to native
-
trunk/ui/datepicker/compatibility/jquery-calendar-demo.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/compatibility/ui.datepicker.compatibility-3.2.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/compatibility/ui.datepicker.compatibility-3.3.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/compatibility/ui.datepicker.demo-3.2.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/compatibility/ui.datepicker.demo-3.3.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/core/index.html
- Property svn:eol-style set to native
-
trunk/ui/datepicker/core/jquery.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/core/ui.datepicker.css
- Property svn:eol-style set to native
-
trunk/ui/datepicker/core/ui.datepicker.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/demo/jquery.localisation.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/demo/ui.datepicker.alt.css
- Property svn:eol-style set to native
-
trunk/ui/datepicker/demo/ui.datepicker.demo.css
- Property svn:eol-style set to native
-
trunk/ui/datepicker/demo/ui.datepicker.demo.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/extras/thickbox-datepicker/index.html
- Property svn:eol-style set to native
-
trunk/ui/datepicker/extras/thickbox-datepicker/thickbox.css
- Property svn:eol-style set to native
-
trunk/ui/datepicker/extras/thickbox-datepicker/thickbox.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/extras/ui.datepicker.ent
- Property svn:eol-style set to native
-
trunk/ui/datepicker/extras/ui.datepicker.extras.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-ca.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-cs.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-da.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-de.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-es.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-fi.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-fr.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-he.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-hu.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-is.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-it.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-ja.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-ko.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-lt.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-nl.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-no.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-pl.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-pt-BR.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-ro.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-ru.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-sk.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-sv.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-th.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-tr.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-zh-CN.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/i18n/ui.datepicker-zh-TW.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/index.html
- Property svn:eol-style set to native
-
trunk/ui/datepicker/test/jsUnitCore.js
- Property svn:eol-style set to native
-
trunk/ui/datepicker/test/ui.datepicker.jsunit.tests.html
- Property svn:eol-style set to native
-
trunk/ui/datepicker/test/ui.datepicker.tests.html
- Property svn:eol-style set to native
-
trunk/ui/demos/css/style.css
- Property svn:eol-style set to native
-
trunk/ui/demos/functional/ui.accordion.html
- Property svn:eol-style set to native
-
trunk/ui/demos/functional/ui.draggable.html
- Property svn:eol-style set to native
-
trunk/ui/demos/functional/ui.tabs.php
- Property svn:eol-style set to native
-
trunk/ui/demos/real-world/accordion-drawers/index.html
- Property svn:eol-style set to native
-
trunk/ui/demos/real-world/layout/demo.css
- Property svn:eol-style set to native
-
trunk/ui/demos/real-world/layout/demo.js
- Property svn:eol-style set to native
-
trunk/ui/demos/real-world/layout/index.html
- Property svn:eol-style set to native
-
trunk/ui/demos/real-world/photo-manager/index.html
- Property svn:eol-style set to native
-
trunk/ui/demos/real-world/photo-manager/js/demo.js
- Property svn:eol-style set to native
-
trunk/ui/demos/real-world/photo-manager/theme/css/screen.css
- Property svn:eol-style set to native
-
trunk/ui/demos/real-world/product-slider/index.html
- Property svn:eol-style set to native
-
trunk/ui/demos/ui.accordion.html
- Property svn:eol-style set to native
-
trunk/ui/demos/ui.datepicker.html
- Property svn:eol-style set to native
-
trunk/ui/demos/ui.dialog.html
- Property svn:eol-style set to native
-
trunk/ui/demos/ui.draggable.html
- Property svn:eol-style set to native
-
trunk/ui/demos/ui.droppable.html
- Property svn:eol-style set to native
-
trunk/ui/demos/ui.resizable.html
- Property svn:eol-style set to native
-
trunk/ui/demos/ui.selectable.html
- Property svn:eol-style set to native
-
trunk/ui/demos/ui.slider.html
- Property svn:eol-style set to native
-
trunk/ui/demos/ui.sortable.boxes.html
- Property svn:eol-style set to native
-
trunk/ui/demos/ui.sortable.html
- Property svn:eol-style set to native
-
trunk/ui/demos/ui.tablesorter.html
- Property svn:eol-style set to native
-
trunk/ui/demos/ui.tabs.ahah.html
- Property svn:eol-style set to native
-
trunk/ui/demos/ui.tabs.html
- Property svn:eol-style set to native
-
trunk/ui/demos/ui.themes.html
- Property svn:eol-style set to native
-
trunk/ui/tests/dimensions.html
- Property svn:eol-style set to native
-
trunk/ui/tests/droppable_trigger.html
- Property svn:eol-style set to native
-
trunk/ui/tests/history.html
- Property svn:eol-style set to native
-
trunk/ui/tests/slider_test.js
- Property svn:eol-style set to native
-
trunk/ui/tests/sortable_draggable.html
- Property svn:eol-style set to native
-
trunk/ui/tests/sortable_droponempty_events.html
- Property svn:eol-style set to native
-
trunk/ui/tests/sortable_droppable.html
- Property svn:eol-style set to native
-
trunk/ui/tests/uiTest.accordion.html
- Property svn:eol-style set to native
-
trunk/ui/tests/uiTest.accordion.js
- Property svn:eol-style set to native
-
trunk/ui/tests/uiTest.resizables.html
- Property svn:eol-style set to native
-
trunk/ui/tests/uiTest.resizables.js
- Property svn:eol-style set to native
-
trunk/ui/tests/uiTest.selectable.html
- Property svn:eol-style set to native
-
trunk/ui/tests/uiTest.selectable.js
- Property svn:eol-style set to native
-
trunk/ui/tests/uiTest.slider.html
- Property svn:eol-style set to native
-
trunk/ui/tests/uiTest.slider.js
- Property svn:eol-style set to native
-
trunk/ui/ui.accordion.js
r5130 r5143 3 3 * 4 4 * Copyright (c) 2007 Jörn Zaefferer 5 * Dual licensed under the MIT (MIT-LICENSE.txt) 6 * and GPL (GPL-LICENSE.txt) licenses. 5 7 * 6 8 * http://docs.jquery.com/UI/Accordion 7 *8 * Dual licensed under the MIT and GPL licenses:9 * http://www.opensource.org/licenses/mit-license.php10 * http://www.gnu.org/licenses/gpl.html11 9 * 12 10 * Revision: $Id$ … … 15 13 ;(function($) { 16 14 17 $.fn.extend({ 18 accordion: function(options, data) { 19 return this.each(function() { 20 var instance = $.data(this, "accordion"); 21 if (!instance) { 22 $.data(this, "accordion", new $.ui.accordion(this, options)); 23 } else if (typeof options == "string") { 24 instance[options](data); 25 } 26 }); 15 $.fn.extend({ 16 accordion: function(options, data) { 17 return this.each(function() { 18 var instance = $.data(this, "accordion"); 19 if (!instance) { 20 $.data(this, "accordion", new $.ui.accordion(this, options)); 21 } else if (typeof options == "string") { 22 instance[options](data); 23 } 24 }); 25 } 26 }); 27 28 $.ui.accordion = function(container, options) { 29 30 // setup configuration 31 this.options = options = $.extend({}, $.ui.accordion.defaults, options); 32 this.element = container; 33 34 $(container).addClass("ui-accordion"); 35 36 if ( options.navigation ) { 37 var current = $(container).find("a").filter(options.navigationFilter); 38 if ( current.length ) { 39 if ( current.filter(options.header).length ) { 40 options.active = current; 41 } else { 42 options.active = current.parent().parent().prev(); 43 current.addClass("current"); 44 } 45 } 46 } 47 48 // calculate active if not specified, using the first header 49 options.headers = $(container).find(options.header); 50 options.active = findActive(options.headers, options.active); 51 52 if ( options.fillSpace ) { 53 var maxHeight = $(container).parent().height(); 54 options.headers.each(function() { 55 maxHeight -= $(this).outerHeight(); 56 }); 57 var maxPadding = 0; 58 options.headers.next().each(function() { 59 maxPadding = Math.max(maxPadding, $(this).innerHeight() - $(this).height()); 60 }).height(maxHeight - maxPadding); 61 } else if ( options.autoHeight ) { 62 var maxHeight = 0; 63 options.headers.next().each(function() { 64 maxHeight = Math.max(maxHeight, $(this).outerHeight()); 65 }).height(maxHeight); 66 } 67 68 options.headers 69 .not(options.active || "") 70 .next() 71 .hide(); 72 options.active.parent().andSelf().addClass(options.selectedClass); 73 74 if (options.event) 75 $(container).bind((options.event) + ".accordion", clickHandler); 76 }; 77 78 $.ui.accordion.prototype = { 79 activate: function(index) { 80 // call clickHandler with custom event 81 clickHandler.call(this.element, { 82 target: findActive( this.options.headers, index )[0] 83 }); 84 }, 85 86 enable: function() { 87 this.options.disabled = false; 88 }, 89 disable: function() { 90 this.options.disabled = true; 91 }, 92 destroy: function() { 93 this.options.headers.next().css("display", ""); 94 if ( this.options.fillSpace || this.options.autoHeight ) { 95 this.options.headers.next().css("height", ""); 96 } 97 $.removeData(this.element, "accordion"); 98 $(this.element).removeClass("ui-accordion").unbind(".accordion"); 99 } 100 }; 101 102 function scopeCallback(callback, scope) { 103 return function() { 104 return callback.apply(scope, arguments); 105 }; 106 }; 107 108 function completed(cancel) { 109 // if removed while animated data can be empty 110 if (!$.data(this, "accordion")) 111 return; 112 var instance = $.data(this, "accordion"); 113 var options = instance.options; 114 options.running = cancel ? 0 : --options.running; 115 if ( options.running ) 116 return; 117 if ( options.clearStyle ) { 118 options.toShow.add(options.toHide).css({ 119 height: "", 120 overflow: "" 121 }); 122 } 123 $(this).triggerHandler("accordionchange", [options.data], options.change); 27 124 } 28 }); 29 30 $.ui.accordion = function(container, options) { 31 32 // setup configuration 33 this.options = options = $.extend({}, $.ui.accordion.defaults, options); 34 this.element = container; 35 36 $(container).addClass("ui-accordion"); 37 38 if ( options.navigation ) { 39 var current = $(container).find("a").filter(options.navigationFilter); 40 if ( current.length ) { 41 if ( current.filter(options.header).length ) { 42 options.active = current; 125 126 function toggle(toShow, toHide, data, clickedActive, down) { 127 var options = $.data(this, "accordion").options; 128 options.toShow = toShow; 129 options.toHide = toHide; 130 options.data = data; 131 var complete = scopeCallback(completed, this); 132 133 // count elements to animate 134 options.running = toHide.size() == 0 ? toShow.size() : toHide.size(); 135 136 if ( options.animated ) { 137 if ( !options.alwaysOpen && clickedActive ) { 138 $.ui.accordion.animations[options.animated]({ 139 toShow: jQuery([]), 140 toHide: toHide, 141 complete: complete, 142 down: down, 143 autoHeight: options.autoHeight 144 }); 43 145 } else { 44 options.active = current.parent().parent().prev(); 45 current.addClass("current"); 46 } 146 $.ui.accordion.animations[options.animated]({ 147 toShow: toShow, 148 toHide: toHide, 149 complete: complete, 150 down: down, 151 autoHeight: options.autoHeight
