library-mirrors/tablesorter
1
0
Fork 0
mirror of https://github.com/Mottie/tablesorter.git synced 2024-10-08 13:44:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Core: get accurate column count. Fixes #840

Browse Source
This commit is contained in:
Mottie 2015-03-11 18:09:44 -05:00
parent 979b3e5ddc
commit 2e398259b3
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/js/jquery.tablesorter.js vendored
View File

@ -1252,7 +1252,6 @@
ts.computeColumnIndex = function(trs) {
var matrix = [],
lookup = {},
cols = 0, // determine the number of columns
i, j, k, l, $cell, cell, cells, rowIndex, cellId, rowSpan, colSpan, firstAvailCol, matrixrow;
for (i = 0; i < trs.length; i++) {
cells = trs[i].cells;
@ -1274,7 +1273,6 @@
}
}
lookup[cellId] = firstAvailCol;
cols = Math.max(firstAvailCol, cols);
// add data-column
$cell.attr({ 'data-column' : firstAvailCol }); // 'data-row' : rowIndex
for (k = rowIndex; k < rowIndex + rowSpan; k++) {
@ -1288,8 +1286,7 @@
}
}
}
// may not be accurate if # header columns !== # tbody columns
return cols + 1; // add one because it's a zero-based index
return matrixrow.length;
};
// *** Process table ***

2
dist/js/jquery.tablesorter.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
js/jquery.tablesorter.js
View File

@ -1252,7 +1252,6 @@
ts.computeColumnIndex = function(trs) {
var matrix = [],
lookup = {},
cols = 0, // determine the number of columns
i, j, k, l, $cell, cell, cells, rowIndex, cellId, rowSpan, colSpan, firstAvailCol, matrixrow;
for (i = 0; i < trs.length; i++) {
cells = trs[i].cells;
@ -1274,7 +1273,6 @@
}
}
lookup[cellId] = firstAvailCol;
cols = Math.max(firstAvailCol, cols);
// add data-column
$cell.attr({ 'data-column' : firstAvailCol }); // 'data-row' : rowIndex
for (k = rowIndex; k < rowIndex + rowSpan; k++) {
@ -1288,8 +1286,7 @@
}
}
}
// may not be accurate if # header columns !== # tbody columns
return cols + 1; // add one because it's a zero-based index
return matrixrow.length;
};
// *** Process table ***