提交 787b6a6e 编写于 作者: C Catouse

* fixed refreshSize of datatable with option mergeRows.

上级 fa320a3e
...@@ -945,11 +945,12 @@ ...@@ -945,11 +945,12 @@
var findMaxHeight = function($cells) var findMaxHeight = function($cells)
{ {
var mx = 0; var mx = 0, $cell;
$cells.css('height', 'auto'); $cells.css('height', 'auto');
$cells.each(function() $cells.each(function()
{ {
mx = Math.max(mx, $(this).height()); $cell = $(this);
if(!$cell.attr('rowspan')) mx = Math.max(mx, $cell.height());
}); });
return mx; return mx;
}, },
......
...@@ -938,11 +938,12 @@ ...@@ -938,11 +938,12 @@
var findMaxHeight = function($cells) var findMaxHeight = function($cells)
{ {
var mx = 0; var mx = 0, $cell;
$cells.css('height', 'auto'); $cells.css('height', 'auto');
$cells.each(function() $cells.each(function()
{ {
mx = Math.max(mx, $(this).height()); $cell = $(this);
if(!$cell.attr('rowspan')) mx = Math.max(mx, $cell.height());
}); });
return mx; return mx;
}, },
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册