Fix datetime-luxon.js

luxon.fromFormat argument text must really be text so if the d variable
is not do not call luxon.fromFormat as then we will get the dreaded
TypeError: input.match is not a function. When the variable is not text
it will not match anyway so return null in that case.
pull/541/head
Marco van Wieringen 2 years ago
parent dba5a6173b
commit 8c583e9800

@ -29,13 +29,11 @@
}(function ($, luxon) { }(function ($, luxon) {
function strip (d) { function strip (d) {
if ( typeof d === 'string' ) {
// Strip HTML tags and newline characters if possible // Strip HTML tags and newline characters if possible
d = d.replace(/(<.*?>)|(\r?\n|\r)/g, ''); d = d.replace(/(<.*?>)|(\r?\n|\r)/g, '');
// Strip out surrounding white space // Strip out surrounding white space
d = d.trim(); d = d.trim();
}
return d; return d;
} }
@ -45,25 +43,37 @@ $.fn.dataTable.luxon = function ( format, locale, reverseEmpties ) {
// Add type detection // Add type detection
types.detect.unshift( function ( d ) { types.detect.unshift( function ( d ) {
// Null values are acceptable
if ( d === null ) {
return 'luxon-'+format;
}
if ( typeof d === 'string' ) {
d = strip(d); d = strip(d);
// Null and empty values are acceptable // Empty values are acceptable
if ( d === '' || d === null ) { if ( d === '' ) {
return 'luxon-'+format; return 'luxon-'+format;
} }
return luxon.DateTime.fromFormat( d, format).isValid ? return luxon.DateTime.fromFormat( d, format).isValid ?
'luxon-'+format : 'luxon-'+format :
null; null;
} else {
return null;
}
} ); } );
// Add sorting method - use an integer for the sorting // Add sorting method - use an integer for the sorting
types.order[ 'luxon-'+format+'-pre' ] = function ( d ) { types.order[ 'luxon-'+format+'-pre' ] = function ( d ) {
if ( typeof d === 'string' ) {
d = strip(d); d = strip(d);
return !luxon.DateTime.fromFormat(d, format).isValid ? return !luxon.DateTime.fromFormat(d, format).isValid ?
(reverseEmpties ? -Infinity : Infinity) : (reverseEmpties ? -Infinity : Infinity) :
parseInt( luxon.DateTime.fromFormat( d, format).ts, 10 ); parseInt( luxon.DateTime.fromFormat( d, format).ts, 10 );
} else {
return null;
}
}; };
}; };

Loading…
Cancel
Save