mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-11-21 11:04:24 +00:00
accordion: reset overflow to original value after animation completed, fixes some layout issues
This commit is contained in:
parent
4416773888
commit
e24e2aeb7b
@ -293,6 +293,7 @@ $.extend($.ui.accordion, {
|
|||||||
difference = showHeight / hideHeight,
|
difference = showHeight / hideHeight,
|
||||||
padding = options.toShow.outerHeight() - options.toShow.height(),
|
padding = options.toShow.outerHeight() - options.toShow.height(),
|
||||||
margin = options.toShow.css('marginBottom'),
|
margin = options.toShow.css('marginBottom'),
|
||||||
|
overflow = options.toShow.css('overflow')
|
||||||
tmargin = options.toShow.css('marginTop');
|
tmargin = options.toShow.css('marginTop');
|
||||||
options.toShow.css({ height: 0, overflow: 'hidden', marginTop: 0, marginBottom: -padding }).show();
|
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"},{
|
||||||
@ -309,7 +310,7 @@ $.extend($.ui.accordion, {
|
|||||||
if ( !options.autoHeight ) {
|
if ( !options.autoHeight ) {
|
||||||
options.toShow.css("height", "auto");
|
options.toShow.css("height", "auto");
|
||||||
}
|
}
|
||||||
options.toShow.css({marginTop: tmargin, marginBottom: margin});
|
options.toShow.css({marginTop: tmargin, marginBottom: margin, overflow: overflow});
|
||||||
options.complete();
|
options.complete();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user