From f5103cd6c47147ad101bdc53c196c85f94941b6e Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Fri, 21 Mar 2014 08:13:38 +0000 Subject: [PATCH] Fix DataTables/DataTables #289 - Filtering can break with \n - The removal on the \n\r characters should not be dependent upon there being HTML enties detected in the string --- .datatables-commit-sync | 2 +- media/js/jquery.dataTables.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index 570b4e9a..9470f192 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -104b5fac846b79d567d21535737667cc3c91f305 +72b058fd176f39d5b57fa13b8363323077b80fce diff --git a/media/js/jquery.dataTables.js b/media/js/jquery.dataTables.js index 30f596a3..090dbbf1 100644 --- a/media/js/jquery.dataTables.js +++ b/media/js/jquery.dataTables.js @@ -2868,6 +2868,9 @@ cellData = __filter_div_textContent ? __filter_div.textContent : __filter_div.innerText; + } + + if ( cellData.replace ) { cellData = cellData.replace(/[\r\n]/g, ''); }