library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Accordion: fix user-defined style issue when margin is set on expander

Browse Source
This commit is contained in:
Ca-Phun Ung 2008-09-26 02:31:38 +00:00
parent 9246c5117f
commit b920e5893a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/ui.accordion.js
View File

@ -254,8 +254,10 @@ $.extend($.ui.accordion, {
var hideHeight = options.toHide.height(), var hideHeight = options.toHide.height(),
showHeight = options.toShow.height(), showHeight = options.toShow.height(),
difference = showHeight / hideHeight, difference = showHeight / hideHeight,
padding = options.toShow.outerHeight() - options.toShow.height(); padding = options.toShow.outerHeight() - options.toShow.height(),
options.toShow.css({ height: 0, overflow: 'hidden', marginBottom: -padding }).show(); margin = options.toShow.css('marginBottom'),
tmargin = options.toShow.css('marginTop');
options.toShow.css({ height: 0, overflow: 'hidden', marginTop: 0, marginBottom: -padding }).show();
options.toHide.filter(":hidden").each(options.complete).end().filter(":visible").animate({height:"hide"},{ options.toHide.filter(":hidden").each(options.complete).end().filter(":visible").animate({height:"hide"},{
step: function(now) { step: function(now) {
var current = (hideHeight - now) * difference; var current = (hideHeight - now) * difference;
@ -270,7 +272,7 @@ $.extend($.ui.accordion, {
if ( !options.autoHeight ) { if ( !options.autoHeight ) {
options.toShow.css("height", "auto"); options.toShow.css("height", "auto");
} }
options.toShow.css("marginBottom", 0); options.toShow.css({marginTop: tmargin, marginBottom: margin});
options.complete(); options.complete();
} }
}); });