rooty/DataTables
1
0
Fork 0
mirror of https://github.com/DataTables/DataTables.git synced 2025-02-19 17:54:14 +01:00
Code Issues Releases Activity

Fix example: Range filter didn't correctly handle 0

Browse Source
This commit is contained in:
Allan Jardine 2014-06-27 15:24:24 +01:00
parent 485b44965e
commit 6f6d113134
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.datatables-commit-sync
View File

@ -1 +1 @@
35a4dd00a0ea1481ccd404c47ae82b45268f22aa 7701b5c6f11913c2538c33ddf2d77adf8d576810

24
examples/plug-ins/range_filtering.html
View File

@ -22,14 +22,14 @@
/* Custom filtering function which will search data in column four between two values */ /* Custom filtering function which will search data in column four between two values */
$.fn.dataTable.ext.search.push( $.fn.dataTable.ext.search.push(
function( settings, data, dataIndex ) { function( settings, data, dataIndex ) {
var min = $('#min').val() * 1; var min = parseInt( $('#min').val(), 10 );
var max = $('#max').val() * 1; var max = parseInt( $('#max').val(), 10 );
var age = parseFloat( data[3] ) || 0; // use data for the age column var age = parseFloat( data[3] ) || 0; // use data for the age column
if ( ( min == '' && max == '' ) || if ( ( isNaN( min ) && isNaN( max ) ) ||
( min == '' && age <= max ) || ( isNaN( min ) && age <= max ) ||
( min <= age && '' == max ) || ( min <= age && isNaN( max ) ) ||
( min <= age && age <= max ) ) ( min <= age && age <= max ) )
{ {
return true; return true;
} }
@ -574,14 +574,14 @@ $(document).ready(function() {
example:</p><code class="multiline brush: js;">/* Custom filtering function which will search data in column four between two values */ example:</p><code class="multiline brush: js;">/* Custom filtering function which will search data in column four between two values */
$.fn.dataTable.ext.search.push( $.fn.dataTable.ext.search.push(
function( settings, data, dataIndex ) { function( settings, data, dataIndex ) {
var min = $('#min').val() * 1; var min = parseInt( $('#min').val(), 10 );
var max = $('#max').val() * 1; var max = parseInt( $('#max').val(), 10 );
var age = parseFloat( data[3] ) || 0; // use data for the age column var age = parseFloat( data[3] ) || 0; // use data for the age column
if ( ( min == '' &amp;&amp; max == '' ) || if ( ( isNaN( min ) &amp;&amp; isNaN( max ) ) ||
( min == '' &amp;&amp; age &lt;= max ) || ( isNaN( min ) &amp;&amp; age &lt;= max ) ||
( min &lt;= age &amp;&amp; '' == max ) || ( min &lt;= age &amp;&amp; isNaN( max ) ) ||
( min &lt;= age &amp;&amp; age &lt;= max ) ) ( min &lt;= age &amp;&amp; age &lt;= max ) )
{ {
return true; return true;
} }