diff --git a/ChangeLog.markdown b/ChangeLog.markdown index eb16c7f..5705e72 100644 --- a/ChangeLog.markdown +++ b/ChangeLog.markdown @@ -7,7 +7,8 @@ * Fixed destroy for multiple tables https://github.com/vedmack/yadcf/issues/293 * Allow selecting date and time (without closing filter) in date filtering https://github.com/vedmack/yadcf/issues/296 * Added global property - filters_tr_index: Allow to control the index of the inside the thead of the table, e.g when one is used for headers/sort and another is used for filters https://github.com/vedmack/yadcf/issues/297 -* Some of additional closed issues https://github.com/vedmack/yadcf/issues/295 / https://github.com/vedmack/yadcf/issues/308 +* Some of additional closed issues https://github.com/vedmack/yadcf/issues/295 / https://github.com/vedmack/yadcf/issues/308 / https://github.com/vedmack/yadcf/issues/314 + ## 0.8.9 diff --git a/jquery.dataTables.yadcf.js b/jquery.dataTables.yadcf.js index 5243f50..0ed8397 100644 --- a/jquery.dataTables.yadcf.js +++ b/jquery.dataTables.yadcf.js @@ -4,7 +4,7 @@ * Yet Another DataTables Column Filter - (yadcf) * * File: jquery.dataTables.yadcf.js -* Version: 0.9.0.beta.17 (grab latest stable from https://github.com/vedmack/yadcf/releases) +* Version: 0.9.0.beta.18 (grab latest stable from https://github.com/vedmack/yadcf/releases) * * Author: Daniel Reznick * Info: https://github.com/vedmack/yadcf @@ -2040,10 +2040,22 @@ var yadcf = (function ($) { } function sortAlphaNum(a, b) { - var aA = a.replace(reA, ""), - bA = b.replace(reA, ""), + var aA, + bA, aN, bN; + + if (typeof a === 'string') { + aA = a.replace(reA, ''); + } else if (typeof a === 'object' && typeof a.label === 'string') { + aA = a.label.replace(reA, ''); + } + if (typeof b === 'string') { + bA = b.replace(reA, ''); + } else if (typeof b === 'object' && typeof b.label === 'string') { + bA = b.label.replace(reA, ''); + } + if (aA === bA) { aN = parseInt(a.replace(reN, ""), 10); bN = parseInt(b.replace(reN, ""), 10);