Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of https://github.com/zeitiger/DataTables

Add requested changes
  • Loading branch information...
commit 8efdd92a4675fa99bed7006b503585cbf9e4b52d 2 parents 9b003e6 + 4577a52
David Steinkopff authored
Showing with 4 additions and 3 deletions.
  1. +3 −2 media/js/jquery.dataTables.js
  2. +1 −1  media/src/core/core.filter.js
View
5 media/js/jquery.dataTables.js
@@ -631,6 +631,7 @@
*/
function _fnAddTr( oSettings, trs )
{
+ var fnTrimTD = oSettings.fnTrimTD || function(td) { return $.trim(td.innerHTML); };
// Allow an individual node to be passed in
if ( ! trs instanceof $ ) {
trs = $(trs);
@@ -648,7 +649,7 @@
name = td.nodeName.toUpperCase();
if ( name == "TD" || name == "TH" )
{
- d.push( $.trim(td.innerHTML) );
+ d.push( fnTrimTD(td) );
tds.push( td );
}
td = td.nextSibling;
@@ -2155,7 +2156,7 @@
nFilter._DT_Input = jqFilter[0];
jqFilter.val( oPreviousSearch.sSearch.replace('"','"') );
- jqFilter.bind( 'keyup.DT search', function(e) {
+ jqFilter.bind( 'keyup.DT search.DT', function(e) {
/* Update all other filter input elements for the new display */
var n = oSettings.aanFeatures.f;
var val = this.value==="" ? "" : this.value; // mental IE8 fix :-(
View
2  media/src/core/core.filter.js
@@ -29,7 +29,7 @@ function _fnFeatureHtmlFilter ( oSettings )
nFilter._DT_Input = jqFilter[0];
jqFilter.val( oPreviousSearch.sSearch.replace('"','"') );
- jqFilter.bind( 'keyup.DT search', function(e) {
+ jqFilter.bind( 'keyup.DT search.DT', function(e) {
/* Update all other filter input elements for the new display */
var n = oSettings.aanFeatures.f;
var val = this.value==="" ? "" : this.value; // mental IE8 fix :-(
Please sign in to comment.
Something went wrong with that request. Please try again.