Merge pull request #324 from camallen/zero_totalRows

0 evaluates to false in a logical context, allow a zero to be returned for totalRows
This commit is contained in:
Rob G 2013-09-28 22:03:57 -07:00
commit cb5efc05f0

View File

@ -198,7 +198,7 @@
// process data
if ( typeof(c.ajaxProcessing) === "function" ) {
// ajaxProcessing result: [ total, rows, headers ]
var i, j, hsh, $f, $sh, th, d, l, $err,
var i, j, hsh, $f, $sh, th, d, l, $err, rr_count,
$t = $(table),
tc = table.config,
hl = $t.find('thead th').length, tds = '',
@ -224,7 +224,9 @@
.appendTo( $t.find('thead:first') );
tc.$tbodies.eq(0).empty();
} else {
c.totalRows = result[t ? 1 : 0] || c.totalRows || 0;
//ensure a zero returned row count doesn't fail the logical ||
rr_count = result[t ? 1 : 0];
c.totalRows = isNaN(rr_count) ? c.totalRows || 0 : rr_count;
d = result[t ? 0 : 1] || []; // row data
l = d.length;
th = result[2]; // headers