rooty/DataTables
1
0
Fork 0
mirror of https://github.com/DataTables/DataTables.git synced 2024-11-29 11:24:10 +01:00
Code Issues Releases Activity

Dev fix #190 - When rows have been invalidated, a full filter is required

Browse Source 
- If a row has been invalidated, then we need to perform a full
  re-filter, so we need to pass this invalidation information back up
  from the invalidation checker to the filtering functions.
This commit is contained in:
Allan Jardine 2013-05-29 09:12:27 +01:00
parent 748f8634cd
commit 16bb9b0516
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
media/src/core/core.filter.js
View File

@ -224,18 +224,21 @@ function _fnFilter( oSettings, sInput, iForce, bRegex, bSmart, bCaseInsensitive
*/ */
if ( sInput.length <= 0 ) if ( sInput.length <= 0 )
{ {
oSettings.aiDisplay.splice( 0, oSettings.aiDisplay.length);
oSettings.aiDisplay = oSettings.aiDisplayMaster.slice(); oSettings.aiDisplay = oSettings.aiDisplayMaster.slice();
} }
else else
{ {
// Check if any of the rows were invalidated - if so, we need to do a
// full re-filter
var invalidated = _fnBuildSearchArray( oSettings, 1 );
/* /*
* We are starting a new search or the new search string is smaller * We are starting a new search or the new search string is smaller
* then the old one (i.e. delete). Search from the master array * then the old one (i.e. delete). Search from the master array
*/ */
if ( oSettings.aiDisplay.length == oSettings.aiDisplayMaster.length || if ( invalidated || iForce == 1 ||
oPrevSearch.sSearch.length > sInput.length || iForce == 1 || oPrevSearch.sSearch.length > sInput.length ||
sInput.indexOf(oPrevSearch.sSearch) !== 0 ) sInput.indexOf(oPrevSearch.sSearch) !== 0 )
{ {
/* Nuke the old display array - we are going to rebuild it */ /* Nuke the old display array - we are going to rebuild it */
oSettings.aiDisplay.length = 0; oSettings.aiDisplay.length = 0;
@ -286,22 +289,27 @@ function _fnBuildSearchArray ( settings, master )
{ {
var searchData = []; var searchData = [];
var i, ien, rows; var i, ien, rows;
var wasInvalidated = false;
if ( !settings.oFeatures.bServerSide ) { if ( !settings.oFeatures.bServerSide ) {
// Resolve any invalidated rows // Resolve any invalidated rows
_fnFilterData( settings ); wasInvalidated = _fnFilterData( settings );
// Build the search array from the display arrays if ( wasInvalidated ) {
rows = master===1 ? // Build the search array from the display arrays
settings.aiDisplayMaster : rows = master===1 ?
settings.aiDisplay; settings.aiDisplayMaster :
settings.aiDisplay;
for ( i=0, ien=rows.length ; i<ien ; i++ ) { for ( i=0, ien=rows.length ; i<ien ; i++ ) {
searchData.push( settings.aoData[ rows[i] ]._aFilterData.join(' ') ); searchData.push( settings.aoData[ rows[i] ]._aFilterData.join(' ') );
}
settings.asDataSearch = searchData;
} }
settings.asDataSearch = searchData;
} }
return wasInvalidated;
} }
@ -356,6 +364,7 @@ function _fnFilterData ( settings )
var column; var column;
var i, j, ien, jen, filterData, cellData, row; var i, j, ien, jen, filterData, cellData, row;
var fomatters = DataTable.ext.ofnSearch; var fomatters = DataTable.ext.ofnSearch;
var wasInvalidated = false;
for ( i=0, ien=settings.aoData.length ; i<ien ; i++ ) { for ( i=0, ien=settings.aoData.length ; i<ien ; i++ ) {
row = settings.aoData[i]; row = settings.aoData[i];
@ -389,7 +398,10 @@ function _fnFilterData ( settings )
} }
row._aFilterData = filterData; row._aFilterData = filterData;
wasInvalidated = true;
} }
} }
return wasInvalidated;
} }