rooty/DataTables
1
0
Fork 0
mirror of https://github.com/DataTables/DataTables.git synced 2025-01-30 23:52:11 +01:00
Code Issues Releases Activity

Fix: If sType for a column is html and the data is null, then _fnDataToSearch could throw an error - 8987

Browse Source
This commit is contained in:
Allan Jardine 2012-03-14 07:51:07 +00:00
parent c22dfe00d3
commit b5f4938d7d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
media/js/jquery.dataTables.js vendored
View File

@ -2306,6 +2306,10 @@
{ {
return DataTable.ext.ofnSearch[sType]( sData ); return DataTable.ext.ofnSearch[sType]( sData );
} }
else if ( sData === null )
{
return '';
}
else if ( sType == "html" ) else if ( sType == "html" )
{ {
return sData.replace(/[\r\n]/g," ").replace( /<.*?>/g, "" ); return sData.replace(/[\r\n]/g," ").replace( /<.*?>/g, "" );
@ -2314,10 +2318,6 @@
{ {
return sData.replace(/[\r\n]/g," "); return sData.replace(/[\r\n]/g," ");
} }
else if ( sData === null )
{
return '';
}
return sData; return sData;
} }

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

@ -372,6 +372,10 @@ function _fnDataToSearch ( sData, sType )
{ {
return DataTable.ext.ofnSearch[sType]( sData ); return DataTable.ext.ofnSearch[sType]( sData );
} }
else if ( sData === null )
{
return '';
}
else if ( sType == "html" ) else if ( sType == "html" )
{ {
return sData.replace(/[\r\n]/g," ").replace( /<.*?>/g, "" ); return sData.replace(/[\r\n]/g," ").replace( /<.*?>/g, "" );
@ -380,10 +384,6 @@ function _fnDataToSearch ( sData, sType )
{ {
return sData.replace(/[\r\n]/g," "); return sData.replace(/[\r\n]/g," ");
} }
else if ( sData === null )
{
return '';
}
return sData; return sData;
} }