Merge pull request #336 from actorius/patch-1

Adding support mixed date and string column data
pull/339/head
Allan Jardine 8 years ago committed by GitHub
commit 5e24e68f5b

@ -65,8 +65,8 @@ $.fn.dataTable.moment = function ( format, locale ) {
d = $.trim( d ); d = $.trim( d );
} }
return d === '' || d === null ? return !moment(d, format, locale, true).isValid() ?
-Infinity : Infinity :
parseInt( moment( d, format, locale, true ).format( 'x' ), 10 ); parseInt( moment( d, format, locale, true ).format( 'x' ), 10 );
}; };
}; };

Loading…
Cancel
Save