1
0
mirror of https://github.com/DataTables/DataTables.git synced 2025-01-30 23:52:11 +01:00

Fix: Allow non string and numeric data types in the data source (including null and boolean etc). Add suitable unit tests to sanity check this.

This commit is contained in:
Allan Jardine 2011-05-04 19:21:41 +01:00
parent fa85d34b24
commit b52665fd6b
3 changed files with 535 additions and 4 deletions

View File

@ -606,6 +606,8 @@
*/
"string-asc": function ( a, b )
{
if ( typeof a != 'string' ) { a = ''; }
if ( typeof b != 'string' ) { b = ''; }
var x = a.toLowerCase();
var y = b.toLowerCase();
return ((x < y) ? -1 : ((x > y) ? 1 : 0));
@ -613,6 +615,8 @@
"string-desc": function ( a, b )
{
if ( typeof a != 'string' ) { a = ''; }
if ( typeof b != 'string' ) { b = ''; }
var x = a.toLowerCase();
var y = b.toLowerCase();
return ((x < y) ? 1 : ((x > y) ? -1 : 0));
@ -717,10 +721,14 @@
function ( sData )
{
/* Allow zero length strings as a number */
if ( typeof sData == 'number' || sData.length === 0 )
if ( typeof sData == 'number' || sData == null )
{
return 'numeric';
}
else if ( typeof sData != 'string' )
{
return null;
}
var sValidFirstChars = "0123456789-";
var sValidChars = "0123456789.";
@ -766,7 +774,7 @@
function ( sData )
{
var iParse = Date.parse(sData);
if ( (iParse !== null && !isNaN(iParse)) || sData.length === 0 )
if ( (iParse !== null && !isNaN(iParse)) || (typeof sData == 'string' && sData.length === 0) )
{
return 'date';
}
@ -4413,7 +4421,10 @@
function _fnBuildSearchRow( oSettings, aData )
{
var sSearch = '';
var nTmp = document.createElement('div');
if ( typeof oSettings.__nTmpFilter == 'undefined' ) {
oSettings.__nTmpFilter = document.createElement('div');
}
var nTmp = oSettings.__nTmpFilter;
for ( var j=0, jLen=oSettings.aoColumns.length ; j<jLen ; j++ )
{
@ -4486,6 +4497,10 @@
{
return sData.replace(/\n/g," ");
}
else if ( sData == null )
{
return '';
}
return sData;
}
@ -5666,7 +5681,7 @@
for ( var i=0 ; i<oSettings.aoData.length ; i++ )
{
var s = _fnGetCellData( oSettings, i, iCol, '' );
if ( s.length > iMax )
if ( typeof s == 'string' && s.length > iMax )
{
iMax = s.length;
iMaxIndex = i;

View File

@ -0,0 +1,124 @@
<?php
header( 'Expires: Sat, 26 Jul 1997 05:00:00 GMT' );
header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
header( 'Cache-Control: no-store, no-cache, must-revalidate' );
header( 'Cache-Control: post-check=0, pre-check=0', false );
header( 'Pragma: no-cache' );
?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" type="image/ico" href="http://www.sprymedia.co.uk/media/images/favicon.ico" />
<title>DataTables unit testing</title>
<style type="text/css" title="currentStyle">
@import "../../css/demo_page.css";
@import "../../css/demo_table.css";
</style>
<script type="text/javascript" language="javascript" src="../../js/jquery.js"></script>
<script type="text/javascript" language="javascript" src="../../js/jquery.dataTables.js"></script>
<script type="text/javascript" language="javascript" src="../unit_test.js"></script>
<script type="text/javascript" charset="utf-8">
/* Make the data source available for testing */
var gaaData = [
["Trident",null,"Win 95+","4","X"],
["Trident","Internet Explorer 5.0","Win 95+","5","C"],
["Trident","Internet Explorer 5.5","Win 95+","5.5","A"],
[null,"Internet Explorer 6","Win 98+","6","A"],
["Trident","Internet Explorer 7","Win XP SP2+","7","A"],
["Trident","AOL browser (AOL desktop)","Win XP","6","A"],
["Gecko","Firefox 1.0","Win 98+ / OSX.2+","1.7","A"],
["Gecko","Firefox 1.5","Win 98+ / OSX.2+",null,"A"],
["Gecko","Firefox 2.0","Win 98+ / OSX.2+",1.8,"A"],
["Gecko","Firefox 3.0","Win 2k+ / OSX.3+","","A"],
["Gecko","Camino 1.0","OSX.2+","1.8","A"],
["Gecko","Camino 1.5","OSX.3+","1.8","A"],
["Gecko","Netscape 7.2","Win 95+ / Mac OS 8.6-9.2","1.7","A"],
["Gecko","Netscape Browser 8","Win 98SE+","1.7","A"],
["Gecko","Netscape Navigator 9","Win 98+ / OSX.2+","1.8","A"],
["Gecko","Mozilla 1.0","Win 95+ / OSX.1+",1,"A"],
["Gecko","Mozilla 1.1","Win 95+ / OSX.1+",1.1,"A"],
["Gecko",true,"Win 95+ / OSX.1+",1.2,"A"],
["Gecko",false,"Win 95+ / OSX.1+",1.3,"A"],
["Gecko","Mozilla 1.4","Win 95+ / OSX.1+",1.4,"A"],
["Gecko","Mozilla 1.5","Win 95+ / OSX.1+",1.5,"A"],
["Gecko","Mozilla 1.6","Win 95+ / OSX.1+",1.6,"A"],
["Gecko","Mozilla 1.7","Win 98+ / OSX.1+",1.7,"A"],
["Gecko","Mozilla 1.8","Win 98+ / OSX.1+",1.8,"A"],
["Gecko","Seamonkey 1.1","Win 98+ / OSX.2+","1.8","A"],
["Gecko","Epiphany 2.20","Gnome","1.8","A"],
["Webkit","Safari 1.2","OSX.3","125.5","A"],
["Webkit","Safari 1.3","OSX.3","312.8","A"],
["Webkit","Safari 2.0","OSX.4+","419.3","A"],
["Webkit","Safari 3.0","OSX.4+","522.1","A"],
["Webkit","OmniWeb 5.5","OSX.4+","420","A"],
["Webkit","iPod Touch / iPhone","iPod","420.1","A"],
["Webkit","S60","S60","413","A"],
["Presto","Opera 7.0","Win 95+ / OSX.1+","-","A"],
["Presto","Opera 7.5","Win 95+ / OSX.2+","-","A"],
["Presto","Opera 8.0","Win 95+ / OSX.2+","-","A"],
["Presto","Opera 8.5","Win 95+ / OSX.2+","-","A"],
["Presto","Opera 9.0","Win 95+ / OSX.3+","-","A"],
["Presto","Opera 9.2","Win 88+ / OSX.3+","-","A"],
["Presto","Opera 9.5","Win 88+ / OSX.3+","-","A"],
["Presto","Opera for Wii","Wii","-","A"],
["Presto","Nokia N800","N800","-","A"],
["Presto","Nintendo DS browser","Nintendo DS","8.5","C/A<sup>1</sup>"],
["KHTML","Konqureror 3.1","KDE 3.1","3.1","C"],
["KHTML","Konqureror 3.3","KDE 3.3","3.3","A"],
["KHTML","Konqureror 3.5","KDE 3.5","3.5","A"],
["Tasman","Internet Explorer 4.5","Mac OS 8-9","-","X"],
["Tasman","Internet Explorer 5.1","Mac OS 7.6-9","1","C"],
["Tasman","Internet Explorer 5.2","Mac OS 8-X","1","C"],
["Misc","NetFront 3.1","Embedded devices","-","C"],
["Misc","NetFront 3.4","Embedded devices","-","A"],
["Misc","Dillo 0.8","Embedded devices","-","X"],
["Misc","Links","Text only","-","X"],
["Misc","Lynx","Text only","-","X"],
["Misc","IE Mobile","Windows Mobile 6","-","C"],
["Misc","PSP browser","PSP","-","C"],
["Other browsers","All others","-","-","U"]
];
</script>
<?php
$aScripts = explode( ":", $_GET['scripts'] );
for ( $i=0 ; $i<count($aScripts) ; $i++ )
{
echo '<script type="text/javascript" language="javascript" src="../'.$aScripts[$i].'?rand='.rand().'"></script>'."\n";
}
?>
</head>
<body id="dt_example">
<div id="container">
<div class="full_width big">
<i>DataTables</i> unit test template for reading DOM data
</div>
<div id="demo">
<table cellpadding="0" cellspacing="0" border="0" class="display" id="example">
<thead>
<tr>
<th>Rendering engine</th>
<th>Browser</th>
<th>Platform(s)</th>
<th>Engine version</th>
<th>CSS grade</th>
</tr>
</thead>
<tbody>
</tbody>
<tfoot>
<tr>
<th>Rendering engine</th>
<th>Browser</th>
<th>Platform(s)</th>
<th>Engine version</th>
<th>CSS grade</th>
</tr>
</tfoot>
</table>
</div>
<div class="spacer"></div>
</div>
</body>
</html>

View File

@ -0,0 +1,392 @@
// DATA_TEMPLATE: js_data_mixed_types
oTest.fnStart( "Sanity checks for DataTables with data from JS with mixed data types" );
$(document).ready( function () {
var oInit = {
"aaData": gaaData
};
$('#example').dataTable( oInit );
oTest.fnTest(
"10 rows shown on the first page",
null,
function () { return $('#example tbody tr').length == 10; }
);
oTest.fnTest(
"Initial sort occured",
null,
function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == "" &&
$('#example tbody tr:eq(1) td:eq(0)').html() == "Gecko"; }
);
/* Need to use the WaitTest for sorting due to the setTimeout datatables uses */
oTest.fnTest(
"Sorting (first click) on second column",
function () { $('#example thead th:eq(1)').click(); },
function () { return $('#example tbody td:eq(1)').html() == "true"; }
);
oTest.fnTest(
"Sorting (second click) on second column",
function () { $('#example thead th:eq(1)').click(); },
function () { return $('#example tbody td:eq(1)').html() == "Seamonkey 1.1"; }
);
oTest.fnTest(
"Sorting (third click) on second column",
function () { $('#example thead th:eq(1)').click(); },
function () { return $('#example tbody td:eq(1)').html() == "true"; }
);
oTest.fnTest(
"Sorting (first click) on numeric column",
function () { $('#example thead th:eq(3)').click(); },
function () { return $('#example tbody td:eq(3)').html() == "-"; }
);
oTest.fnTest(
"Sorting (second click) on numeric column",
function () { $('#example thead th:eq(3)').click(); },
function () { return $('#example tbody td:eq(3)').html() == "522.1"; }
);
oTest.fnTest(
"Sorting multi-column (first click)",
function () {
$('#example thead th:eq(0)').click();
oDispacher.click( $('#example thead th:eq(1)')[0], { 'shift': true } ); },
function () { var b =
$('#example tbody tr:eq(1) td:eq(0)').html() == "Gecko" &&
$('#example tbody tr:eq(1) td:eq(1)').html() == "false"; return b; }
);
oTest.fnTest(
"Sorting multi-column - sorting second column only",
function () {
$('#example thead th:eq(1)').click(); },
function () { return $('#example tbody td:eq(1)').html() == "false"; }
);
/* Basic paging */
oTest.fnTest(
"Paging to second page",
function () { $('#example_next').click(); },
function () { return $('#example tbody td:eq(1)').html() == "Firefox 1.5"; }
);
oTest.fnTest(
"Paging to first page",
function () { $('#example_previous').click(); },
function () { return $('#example tbody td:eq(1)').html() == "false"; }
);
oTest.fnTest(
"Attempting to page back beyond the first page",
function () { $('#example_previous').click(); },
function () { return $('#example tbody td:eq(1)').html() == "false"; }
);
/* Changing length */
oTest.fnTest(
"Changing table length to 25 records",
function () { $("select[name=example_length]").val('25').change(); },
function () { return $('#example tbody tr').length == 25; }
);
oTest.fnTest(
"Changing table length to 50 records",
function () { $("select[name=example_length]").val('50').change(); },
function () { return $('#example tbody tr').length == 50; }
);
oTest.fnTest(
"Changing table length to 100 records",
function () { $("select[name=example_length]").val('100').change(); },
function () { return $('#example tbody tr').length == 57; }
);
oTest.fnTest(
"Changing table length to 10 records",
function () { $("select[name=example_length]").val('10').change(); },
function () { return $('#example tbody tr').length == 10; }
);
/*
* Information element
*/
oTest.fnTest(
"Information on zero config",
null,
function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries"; }
);
oTest.fnTest(
"Information on second page",
function () { $('#example_next').click(); },
function () { return document.getElementById('example_info').innerHTML == "Showing 11 to 20 of 57 entries"; }
);
oTest.fnTest(
"Information on third page",
function () { $('#example_next').click(); },
function () { return document.getElementById('example_info').innerHTML == "Showing 21 to 30 of 57 entries"; }
);
oTest.fnTest(
"Information on last page",
function () {
$('#example_next').click();
$('#example_next').click();
$('#example_next').click();
},
function () { return document.getElementById('example_info').innerHTML == "Showing 51 to 57 of 57 entries"; }
);
oTest.fnTest(
"Information back on first page",
function () {
$('#example_previous').click();
$('#example_previous').click();
$('#example_previous').click();
$('#example_previous').click();
$('#example_previous').click();
},
function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries"; }
);
oTest.fnTest(
"Information with 25 records",
function () { $("select[name=example_length]").val('25').change(); },
function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 25 of 57 entries"; }
);
oTest.fnTest(
"Information with 25 records - second page",
function () { $('#example_next').click(); },
function () { return document.getElementById('example_info').innerHTML == "Showing 26 to 50 of 57 entries"; }
);
oTest.fnTest(
"Information with 100 records - first page",
function () {
$('#example_previous').click();
$("select[name=example_length]").val('100').change();
},
function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 57 of 57 entries"; }
);
oTest.fnTest(
"Information back to 10 records",
function () {
$('#example_previous').click();
$("select[name=example_length]").val('10').change();
},
function () { return document.getElementById('example_info').innerHTML == "Showing 1 to 10 of 57 entries"; }
);
oTest.fnTest(
"Information with filter 'Win'",
function () { $('#example_filter input').val("Win").keyup(); },
function () { return document.getElementById('example_info').innerHTML ==
"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
);
oTest.fnTest(
"Information with filter 'Win' second page",
function () { $('#example_next').click(); },
function () { return document.getElementById('example_info').innerHTML ==
"Showing 11 to 20 of 31 entries (filtered from 57 total entries)"; }
);
oTest.fnTest(
"Information with filter 'Win' last page",
function () {
$('#example_next').click();
$('#example_next').click();
},
function () { return document.getElementById('example_info').innerHTML ==
"Showing 31 to 31 of 31 entries (filtered from 57 total entries)"; }
);
oTest.fnTest(
"Information with filter 'Win' back to first page",
function () {
$('#example_previous').click();
$('#example_previous').click();
$('#example_previous').click();
},
function () { return document.getElementById('example_info').innerHTML ==
"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
);
oTest.fnTest(
"Information with filter 'Win' second page - second time",
function () {
$('#example_next').click();
},
function () { return document.getElementById('example_info').innerHTML ==
"Showing 11 to 20 of 31 entries (filtered from 57 total entries)"; }
);
oTest.fnTest(
"Information with filter increased to 'Win 98'",
function () { $('#example_filter input').val("Win 98").keyup(); },
function () { return document.getElementById('example_info').innerHTML ==
"Showing 1 to 9 of 9 entries (filtered from 57 total entries)"; }
);
oTest.fnTest(
"Information with filter decreased to 'Win'",
function () { $('#example_filter input').val("Win").keyup(); },
function () { return document.getElementById('example_info').innerHTML ==
"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
);
oTest.fnTest(
"Information with filter 'Win' second page - third time",
function () {
$('#example_next').click();
},
function () { return document.getElementById('example_info').innerHTML ==
"Showing 11 to 20 of 31 entries (filtered from 57 total entries)"; }
);
oTest.fnTest(
"Information with filter removed",
function () { $('#example_filter input').val("").keyup(); },
function () { return document.getElementById('example_info').innerHTML ==
"Showing 1 to 10 of 57 entries"; }
);
/*
* Filtering
*/
oTest.fnTest(
"Filter 'W' - rows",
function () {
/* Reset the table such that the old sorting doesn't mess things up */
oSession.fnRestore();
$('#example').dataTable( oInit );
$('#example_filter input').val("W").keyup(); },
function () { return $('#example tbody tr:eq(0) td:eq(0)').html() == ""; }
);
oTest.fnTest(
"Filter 'W' - info",
null,
function () { return document.getElementById('example_info').innerHTML ==
"Showing 1 to 10 of 42 entries (filtered from 57 total entries)"; }
);
oTest.fnTest(
"Filter 'Wi'",
function () { $('#example_filter input').val("Wi").keyup(); },
function () { return document.getElementById('example_info').innerHTML ==
"Showing 1 to 10 of 32 entries (filtered from 57 total entries)"; }
);
oTest.fnTest(
"Filter 'Win'",
function () { $('#example_filter input').val("Win").keyup(); },
function () { return document.getElementById('example_info').innerHTML ==
"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
);
oTest.fnTest(
"Filter 'Win' - sorting column 1",
function () { $('#example thead th:eq(1)').click(); },
function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "true"; }
);
oTest.fnTest(
"Filter 'Win' - sorting column 1 info",
null,
function () { return document.getElementById('example_info').innerHTML ==
"Showing 1 to 10 of 31 entries (filtered from 57 total entries)"; }
);
oTest.fnTest(
"Filter 'Win' - sorting column 1 reverse",
function () { $('#example thead th:eq(1)').click(); },
function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Seamonkey 1.1"; }
);
oTest.fnTest(
"Filter 'Win XP' - maintaing reverse sorting col 1",
function () { $('#example_filter input').val("Win XP").keyup(); },
function () { return $('#example tbody tr:eq(0) td:eq(1)').html() == "Internet Explorer 7"; }
);
oTest.fnTest(
"Filter 'Win XP' - sorting col 3",
function () { $('#example thead th:eq(3)').click(); },
function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == "5"; }
);
oTest.fnTest(
"Filter 'Win XP' - sorting col 3 - reversed",
function () { $('#example thead th:eq(3)').click(); },
function () { return $('#example tbody tr:eq(0) td:eq(3)').html() == "7"; }
);
oTest.fnTest(
"Filter 'Win' - sorting col 3 - reversed info",
null,
function () { return document.getElementById('example_info').innerHTML ==
"Showing 1 to 5 of 5 entries (filtered from 57 total entries)"; }
);
oTest.fnTest(
"Filter 'nothinghere'",
function () { $('#example_filter input').val("nothinghere").keyup(); },
function () { return $('#example tbody tr:eq(0) td:eq(0)').html() ==
"No matching records found"; }
);
oTest.fnTest(
"Filter 'nothinghere' - info",
null,
function () { return document.getElementById('example_info').innerHTML ==
"Showing 0 to 0 of 0 entries (filtered from 57 total entries)"; }
);
oTest.fnTest(
"Filter back to blank and 1st column sorting",
function () {
$('#example_filter input').val("").keyup();
$('#example thead th:eq(0)').click();
},
function () { return document.getElementById('example_info').innerHTML ==
"Showing 1 to 10 of 57 entries"; }
);
oTest.fnTest(
"Prefixing a filter entry",
function () {
$('#example_filter input').val("Win").keyup();
$('#example_filter input').val("GeckoWin").keyup();
},
function () { return document.getElementById('example_info').innerHTML ==
"Showing 0 to 0 of 0 entries (filtered from 57 total entries)"; }
);
oTest.fnTest(
"Prefixing a filter entry with space",
function () {
$('#example_filter input').val("Gecko Win").keyup();
},
function () { return document.getElementById('example_info').innerHTML ==
"Showing 1 to 10 of 17 entries (filtered from 57 total entries)"; }
);
oTest.fnComplete();
} );