library-mirrors/tablesorter
1
0
Fork 0
mirror of https://github.com/Mottie/tablesorter.git synced 2024-11-15 23:54:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Filter: remove old cached indexing, it was returning incorrect rows. Fixes #600

Browse Source
This commit is contained in:
Mottie 2014-04-30 20:51:34 -05:00
parent f5c51b6099
commit b4cf73d5ae
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/jquery.tablesorter.widgets.js
View File

@ -854,7 +854,7 @@ ts.filter = {
}, },
findRows: function(table, filters, combinedFilters) { findRows: function(table, filters, combinedFilters) {
if (table.config.lastCombinedFilter === combinedFilters) { return; } if (table.config.lastCombinedFilter === combinedFilters) { return; }
var cached, len, $rows, cacheIndex, rowIndex, tbodyIndex, $tbody, $cells, columnIndex, var cached, len, $rows, rowIndex, tbodyIndex, $tbody, $cells, columnIndex,
childRow, childRowText, exact, iExact, iFilter, lastSearch, matches, result, childRow, childRowText, exact, iExact, iFilter, lastSearch, matches, result,
notFiltered, searchFiltered, filterMatched, showRow, time, notFiltered, searchFiltered, filterMatched, showRow, time,
anyMatch, iAnyMatch, rowArray, rowText, iRowText, rowCache, anyMatch, iAnyMatch, rowArray, rowText, iRowText, rowCache,
@ -914,7 +914,6 @@ ts.filter = {
iAnyMatch = anyMatch.toLowerCase(); iAnyMatch = anyMatch.toLowerCase();
} }
// loop through the rows // loop through the rows
cacheIndex = 0;
for (rowIndex = 0; rowIndex < len; rowIndex++) { for (rowIndex = 0; rowIndex < len; rowIndex++) {
childRow = $rows[rowIndex].className; childRow = $rows[rowIndex].className;
// skip child rows & already filtered rows // skip child rows & already filtered rows
@ -933,7 +932,7 @@ ts.filter = {
rowArray = $cells.map(function(i){ rowArray = $cells.map(function(i){
var txt; var txt;
if (parsed[i]) { if (parsed[i]) {
txt = c.cache[tbodyIndex].normalized[cacheIndex][i]; txt = c.cache[tbodyIndex].normalized[rowIndex][i];
} else { } else {
txt = wo.filter_ignoreCase ? $(this).text().toLowerCase() : $(this).text(); txt = wo.filter_ignoreCase ? $(this).text().toLowerCase() : $(this).text();
if (c.sortLocaleCompare) { if (c.sortLocaleCompare) {
@ -944,7 +943,7 @@ ts.filter = {
}).get(); }).get();
rowText = rowArray.join(' '); rowText = rowArray.join(' ');
iRowText = rowText.toLowerCase(); iRowText = rowText.toLowerCase();
rowCache = c.cache[tbodyIndex].normalized[cacheIndex].slice(0,-1).join(' '); rowCache = c.cache[tbodyIndex].normalized[rowIndex].slice(0,-1).join(' ');
filterMatched = null; filterMatched = null;
$.each(ts.filter.types, function(type, typeFunction) { $.each(ts.filter.types, function(type, typeFunction) {
if ($.inArray(type, anyMatchNotAllowedTypes) < 0) { if ($.inArray(type, anyMatchNotAllowedTypes) < 0) {
@ -965,7 +964,7 @@ ts.filter = {
for (columnIndex = 0; columnIndex < columns; columnIndex++) { for (columnIndex = 0; columnIndex < columns; columnIndex++) {
// ignore if filter is empty or disabled // ignore if filter is empty or disabled
if (filters[columnIndex]) { if (filters[columnIndex]) {
cached = c.cache[tbodyIndex].normalized[cacheIndex][columnIndex]; cached = c.cache[tbodyIndex].normalized[rowIndex][columnIndex];
// check if column data should be from the cell or from parsed data // check if column data should be from the cell or from parsed data
if (wo.filter_useParsedData || parsed[columnIndex]) { if (wo.filter_useParsedData || parsed[columnIndex]) {
exact = cached; exact = cached;
@ -1021,7 +1020,6 @@ ts.filter = {
if (childRow.length) { if (childRow.length) {
childRow.toggleClass(wo.filter_filteredRow, !showRow); childRow.toggleClass(wo.filter_filteredRow, !showRow);
} }
cacheIndex++;
} }
} }
ts.processTbody(table, $tbody, false); ts.processTbody(table, $tbody, false);