Merge fbbf58c into master (original version was made against v1.3)

master
Freek Dijkstra 2012-02-27 15:47:22 +01:00
commit c9739b737f
1 changed files with 8 additions and 0 deletions

View File

@ -76,6 +76,7 @@
$temp,
tfootHeight = 0;
settings.originalTable = $(this).clone();
settings.includePadding = helpers._isPaddingIncludedWithWidth();
settings.scrollbarOffset = helpers._getScrollbarWidth();
settings.themeClassName = settings.themeClass;
@ -129,6 +130,7 @@
$divHead = $('<div class="fht-thead"><table class="fht-table"></table></div>').prependTo($wrapper);
}
$divHead.find('table.fht-table').addClass(settings.originalTable.attr('class'));
$thead.clone().appendTo($divHead.find('table'));
} else {
$divHead = $wrapper.find('div.fht-thead');
@ -405,6 +407,10 @@
fixedBodyHeight = $fixedBody.find('.fht-tbody').height() - settings.scrollbarOffset,
$newRow;
$thead.find('table.fht-table').addClass(settings.originalTable.attr('class'));
$tbody.find('table.fht-table').addClass(settings.originalTable.attr('class'));
$tfoot.find('table.fht-table').addClass(settings.originalTable.attr('class'));
$firstThChildren = $fixedBody.find('.fht-thead thead tr > *:lt(' + settings.fixedColumns + ')');
fixedColumnWidth = settings.fixedColumns * tableProps.border;
$firstThChildren.each(function(index) {
@ -512,6 +518,7 @@
$divFoot = $('<div class="fht-tfoot"><table class="fht-table"></table></div>').appendTo($wrapper);
}
}
$divFoot.find('table.fht-table').addClass(settings.originalTable.attr('class'));
switch (true) {
case !$tfoot.length && settings.cloneHeadToFoot == true && settings.footer == true:
@ -618,6 +625,7 @@
defaultHeight,
newHeight;
$obj.addClass(settings.originalTable.attr('class'));
$obj.appendTo('body');
defaultHeight = $obj.find('td').height();