From 9fb4492053703f326e411008b5ddf28509902b3e Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Wed, 25 Jan 2012 16:09:41 +0000 Subject: [PATCH] Fix: aoPreSearchCols can be given as null if you want to deinfe multiple columns - doing so would have resulted in an error. Fixed (unit test) --- media/js/jquery.dataTables.js | 2 +- media/src/core/core.columns.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 03d7d6f6..7bc1f456 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -81,7 +81,7 @@ oSettings.aoColumns.push( oCol ); /* Add a column specific filter */ - if ( oSettings.aoPreSearchCols[ iCol ] === undefined ) + if ( oSettings.aoPreSearchCols[ iCol ] === undefined || oSettings.aoPreSearchCols[ iCol ] === null ) { oSettings.aoPreSearchCols[ iCol ] = $.extend( {}, DataTable.models.oSearch ); } diff --git a/media/src/core/core.columns.js b/media/src/core/core.columns.js index cac53c97..aef8abe8 100644 --- a/media/src/core/core.columns.js +++ b/media/src/core/core.columns.js @@ -21,7 +21,7 @@ function _fnAddColumn( oSettings, nTh ) oSettings.aoColumns.push( oCol ); /* Add a column specific filter */ - if ( oSettings.aoPreSearchCols[ iCol ] === undefined ) + if ( oSettings.aoPreSearchCols[ iCol ] === undefined || oSettings.aoPreSearchCols[ iCol ] === null ) { oSettings.aoPreSearchCols[ iCol ] = $.extend( {}, DataTable.models.oSearch ); }