diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index aa7e2626..a90b76bc 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -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 iMax ) + if ( typeof s == 'string' && s.length > iMax ) { iMax = s.length; iMaxIndex = i; diff --git a/media/unit_testing/templates/js_data_mixed_types.php b/media/unit_testing/templates/js_data_mixed_types.php new file mode 100644 index 00000000..9cdd0aa4 --- /dev/null +++ b/media/unit_testing/templates/js_data_mixed_types.php @@ -0,0 +1,124 @@ + + + + + + + DataTables unit testing + + + + + + '."\n"; + } + ?> + + +
+
+ DataTables unit test template for reading DOM data +
+ +
+ + + + + + + + + + + + + + + + + + + + + +
Rendering engineBrowserPlatform(s)Engine versionCSS grade
Rendering engineBrowserPlatform(s)Engine versionCSS grade
+
+
+
+ + \ No newline at end of file diff --git a/media/unit_testing/tests_onhold/2_js/js_data_mixed_types.js b/media/unit_testing/tests_onhold/2_js/js_data_mixed_types.js new file mode 100644 index 00000000..e5389352 --- /dev/null +++ b/media/unit_testing/tests_onhold/2_js/js_data_mixed_types.js @@ -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(); +} ); \ No newline at end of file