|
1 | 1 | /*! |
2 | | - * jquery.dgtable 0.5.16 |
| 2 | + * jquery.dgtable 0.5.17 |
3 | 3 | * git://github.com/danielgindi/jquery.dgtable.git |
4 | 4 | */ |
5 | 5 |
|
@@ -121,7 +121,7 @@ return /******/ (function(modules) { // webpackBootstrap |
121 | 121 | * @expose |
122 | 122 | * @type {string} |
123 | 123 | */ |
124 | | - DGTable.VERSION = '0.5.16'; |
| 124 | + DGTable.VERSION = '0.5.17'; |
125 | 125 |
|
126 | 126 | /** |
127 | 127 | * @public |
@@ -1214,7 +1214,8 @@ return /******/ (function(modules) { // webpackBootstrap |
1214 | 1214 | p = that.p; |
1215 | 1215 |
|
1216 | 1216 | if (p.filteredRows && p.filterArgs) { |
1217 | | - p.filteredRows = p.rows.filteredCollection(p.filterArgs); |
| 1217 | + var filterFunc = that.o.filter || _by_column_filter2['default']; |
| 1218 | + p.filteredRows = p.rows.filteredCollection(filterFunc, p.filterArgs); |
1218 | 1219 | } |
1219 | 1220 | return this; |
1220 | 1221 | }; |
@@ -1394,7 +1395,9 @@ return /******/ (function(modules) { // webpackBootstrap |
1394 | 1395 |
|
1395 | 1396 | if (currentSort.length) { |
1396 | 1397 | p.rows.sort(!!p.filteredRows); |
1397 | | - this._refilter(); |
| 1398 | + if (p.filteredRows) { |
| 1399 | + p.filteredRows.sort(!!p.filteredRows); |
| 1400 | + } |
1398 | 1401 | } |
1399 | 1402 |
|
1400 | 1403 | // Build output for event, with option names that will survive compilers |
@@ -1430,8 +1433,10 @@ return /******/ (function(modules) { // webpackBootstrap |
1430 | 1433 | p.rows.sortColumn = currentSort; |
1431 | 1434 | if (currentSort.length) { |
1432 | 1435 | p.rows.sort(!!p.filteredRows); |
| 1436 | + if (p.filteredRows) { |
| 1437 | + p.filteredRows.sort(!!p.filteredRows); |
| 1438 | + } |
1433 | 1439 | } |
1434 | | - this._refilter(); |
1435 | 1440 |
|
1436 | 1441 | // Build output for event, with option names that will survive compilers |
1437 | 1442 | var sorts = []; |
|
0 commit comments