library-mirrors/tablesorter
1
0
Fork 0
mirror of https://github.com/Mottie/tablesorter.git synced 2024-12-05 05:04:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Core: Ensure sort parameters are defined. Fixes #1566

Browse Source
This commit is contained in:
Rob Garrison 2018-07-10 08:07:12 -05:00
parent 0331751645
commit f061f107b6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/jquery.tablesorter.js
View File

@ -1761,7 +1761,7 @@
sort = sorter[ col ]( x[ col ], y[ col ], dir, col, table ); sort = sorter[ col ]( x[ col ], y[ col ], dir, col, table );
} else { } else {
// fall back to natural sort // fall back to natural sort
sort = ts[ 'sortNatural' + ( dir ? 'Asc' : 'Desc' ) ]( a[ col ], b[ col ], col, c ); sort = ts[ 'sortNatural' + ( dir ? 'Asc' : 'Desc' ) ]( a[ col ] || '', b[ col ] || '', col, c );
} }
} }
if ( sort ) { return sort; } if ( sort ) { return sort; }
@ -1860,20 +1860,20 @@
// Natural sort - https://github.com/overset/javascript-natural-sort (date sorting removed) // Natural sort - https://github.com/overset/javascript-natural-sort (date sorting removed)
sortNatural : function( a, b ) { sortNatural : function( a, b ) {
if ( a === b ) { return 0; } if ( a === b ) { return 0; }
a = a.toString(); a = ( a || '' ).toString();
b = b.toString(); b = ( b || '' ).toString();
var aNum, bNum, aFloat, bFloat, indx, max, var aNum, bNum, aFloat, bFloat, indx, max,
regex = ts.regex; regex = ts.regex;
// first try and sort Hex codes // first try and sort Hex codes
if ( regex.hex.test( b ) ) { if ( regex.hex.test( b ) ) {
aNum = parseInt( ( a || '' ).match( regex.hex ), 16 ); aNum = parseInt( a.match( regex.hex ), 16 );
bNum = parseInt( ( b || '' ).match( regex.hex ), 16 ); bNum = parseInt( b.match( regex.hex ), 16 );
if ( aNum < bNum ) { return -1; } if ( aNum < bNum ) { return -1; }
if ( aNum > bNum ) { return 1; } if ( aNum > bNum ) { return 1; }
} }
// chunk/tokenize // chunk/tokenize
aNum = ( a || '' ).replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' ); aNum = a.replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' );
bNum = ( b || '' ).replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' ); bNum = b.replace( regex.chunk, '\\0$1\\0' ).replace( regex.chunks, '' ).split( '\\0' );
max = Math.max( aNum.length, bNum.length ); max = Math.max( aNum.length, bNum.length );
// natural sorting through split numeric strings and default strings // natural sorting through split numeric strings and default strings
for ( indx = 0; indx < max; indx++ ) { for ( indx = 0; indx < max; indx++ ) {