|
|
@ -40,8 +40,8 @@ function naturalSort (a, b) {
|
|
|
|
// natural sorting through split numeric strings and default strings
|
|
|
|
// natural sorting through split numeric strings and default strings
|
|
|
|
for(var cLoc=0, numS=Math.max(xN.length, yN.length); cLoc < numS; cLoc++) {
|
|
|
|
for(var cLoc=0, numS=Math.max(xN.length, yN.length); cLoc < numS; cLoc++) {
|
|
|
|
// find floats not starting with '0', string or 0 if not defined (Clint Priest)
|
|
|
|
// find floats not starting with '0', string or 0 if not defined (Clint Priest)
|
|
|
|
oFxNcL = !(xN[cLoc] || '').match(ore) && parseFloat(xN[cLoc]) || xN[cLoc] || 0;
|
|
|
|
var oFxNcL = !(xN[cLoc] || '').match(ore) && parseFloat(xN[cLoc]) || xN[cLoc] || 0;
|
|
|
|
oFyNcL = !(yN[cLoc] || '').match(ore) && parseFloat(yN[cLoc]) || yN[cLoc] || 0;
|
|
|
|
var oFyNcL = !(yN[cLoc] || '').match(ore) && parseFloat(yN[cLoc]) || yN[cLoc] || 0;
|
|
|
|
// handle numeric vs string comparison - number < string - (Kyle Adams)
|
|
|
|
// handle numeric vs string comparison - number < string - (Kyle Adams)
|
|
|
|
if (isNaN(oFxNcL) !== isNaN(oFyNcL)) return (isNaN(oFxNcL)) ? 1 : -1;
|
|
|
|
if (isNaN(oFxNcL) !== isNaN(oFyNcL)) return (isNaN(oFxNcL)) ? 1 : -1;
|
|
|
|
// rely on string comparison if different types - i.e. '02' < 2 != '02' < '2'
|
|
|
|
// rely on string comparison if different types - i.e. '02' < 2 != '02' < '2'
|
|
|
|