averello/jQuery-EasyTabs-mirror
1
0
Fork 0
mirror of https://github.com/JangoSteve/jQuery-EasyTabs.git synced 2026-06-10 15:37:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16 from heldchen/patch-1

Browse Source 
do not measure the tab's height if no animation is used to prevent javascript firing again
This commit is contained in:
Steve Schwartz
2011-09-27 19:20:56 -07:00
parent b25ae15f88 b56b8cad8a
commit 685419cd1d
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
javascripts/jquery.easytabs.js
+11 -6
View File
@@ -286,18 +286,23 @@
if( fire($container,"easytabs:before", [$clicked, $targetPanel, data]) ){
var $visiblePanel = $panels.filter(":visible"),
$panelContainer = $targetPanel.parent(),
targetHeight = $.fn.easytabs.methods.getHeightForHidden.apply($targetPanel),
visibleHeight = $visiblePanel.length ? $.fn.easytabs.methods.setAndReturnHeight.apply($visiblePanel) : 0,
heightDifference = targetHeight - visibleHeight,
showPanel = function(){
// At this point, the previous panel is hidden, and the new one will be selected
$container.trigger("easytabs:midTransition", [$clicked, $targetPanel, data]);
// Gracefully animate between panels of differing heights, start height change animation *after* panel change if panel needs to contract,
// so that there is no chance of making the visible panel overflowing the height of the target panel
if( opts.animate && opts.transitionIn == 'fadeIn' && heightDifference < 0 ) $panelContainer.animate({
height: $panelContainer.height() + heightDifference
}, transitions.halfSpeed ).css({ 'min-height': '' });
if( opts.animate && opts.transitionIn == 'fadeIn')
{
var targetHeight = $.fn.easytabs.methods.getHeightForHidden.apply($targetPanel),
visibleHeight = $visiblePanel.length ? $.fn.easytabs.methods.setAndReturnHeight.apply($visiblePanel) : 0,
heightDifference = targetHeight - visibleHeight;
if (heightDifference < 0)
$panelContainer.animate({
height: $panelContainer.height() + heightDifference
}, transitions.halfSpeed ).css({ 'min-height': '' });
}
if ( opts.updateHash && ! skipUpdateToHash ) {
//window.location = url.toString().replace((url.pathname + hash), (url.pathname + $clicked.attr("href")));