Fixed datetime sorting

Fixes #30
pull/64/head
Jordan Wright 2015-10-03 13:32:09 -05:00
parent 3bbd6b7ca1
commit b4a73ae5c7
3 changed files with 54 additions and 0 deletions

View File

@ -0,0 +1,48 @@
/**
* This plug-in for DataTables represents the ultimate option in extensibility
* for sorting date / time strings correctly. It uses
* [Moment.js](http://momentjs.com) to create automatic type detection and
* sorting plug-ins for DataTables based on a given format. This way, DataTables
* will automatically detect your temporal information and sort it correctly.
*
* For usage instructions, please see the DataTables blog
* post that [introduces it](//datatables.net/blog/2014-12-18).
*
* @name Ultimate Date / Time sorting
* @summary Sort date and time in any format using Moment.js
* @author [Allan Jardine](//datatables.net)
* @depends DataTables 1.10+, Moment.js 1.7+
*
* @example
* $.fn.dataTable.moment( 'HH:mm MMM D, YY' );
* $.fn.dataTable.moment( 'dddd, MMMM Do, YYYY' );
*
* $('#example').DataTable();
*/
(function($) {
$.fn.dataTable.moment = function ( format, locale ) {
var types = $.fn.dataTable.ext.type;
// Add type detection
types.detect.unshift( function ( d ) {
// Null and empty values are acceptable
if ( d === '' || d === null ) {
return 'moment-'+format;
}
return moment( d.replace ? d.replace(/<.*?>/g, '') : d, format, locale, true ).isValid() ?
'moment-'+format :
null;
} );
// Add sorting method - use an integer for the sorting
types.order[ 'moment-'+format+'-pre' ] = function ( d ) {
return d === '' || d === null ?
-Infinity :
parseInt( moment( d.replace ? d.replace(/<.*?>/g, '') : d, format, locale, true ).format( 'x' ), 10 );
};
};
}(jQuery));

View File

@ -140,3 +140,8 @@ var api = {
return query("/import/site", "POST", req)
}
}
// Register our moment.js datatables listeners
$(document).ready(function(){
$.fn.dataTable.moment('MMMM Do YYYY, h:mm:ss a');
});

View File

@ -92,6 +92,7 @@
<script src="/js/dataTables.bootstrap.js"></script>
<script src="/js/chartist.min.js"></script>
<script src="/js/moment.min.js"></script>
<script src="/js/datetime-moment.js"></script>
<script src="/js/gophish.js"></script>
{{template "scripts" .}}
</body>