From dbe9ed3dbff5920ae69ff3e611c6c8128f39e656 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Mon, 16 Feb 2015 11:07:17 +0000 Subject: [PATCH] Update - Sorting: Add `-` as a seperator for eu dates --- sorting/date-eu.js | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/sorting/date-eu.js b/sorting/date-eu.js index fdda790..bd001e4 100644 --- a/sorting/date-eu.js +++ b/sorting/date-eu.js @@ -23,36 +23,31 @@ jQuery.extend( jQuery.fn.dataTableExt.oSort, { "date-eu-pre": function ( date ) { date = date.replace(" ", ""); - var eu_date, year; - if (date == '') { + if ( ! date ) { return 0; } - if (date.indexOf('.') > 0) { - /*date a, format dd.mn.(yyyy) ; (year is optional)*/ - eu_date = date.split('.'); - } else { - /*date a, format dd/mn/(yyyy) ; (year is optional)*/ - eu_date = date.split('/'); - } + var year; + var eu_date = date.split(/[\.\-\/]/); /*year (optional)*/ - if (eu_date[2]) { + if ( eu_date[2] ) { year = eu_date[2]; - } else { + } + else { year = 0; } /*month*/ var month = eu_date[1]; - if (month.length == 1) { + if ( month.length == 1 ) { month = 0+month; } /*day*/ var day = eu_date[0]; - if (day.length == 1) { + if ( day.length == 1 ) { day = 0+day; }