Skip to content

Commit 1ac1781

Browse files
committed
0.5.17
1 parent c9a3272 commit 1ac1781

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

dist/jquery.dgtable.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* jquery.dgtable 0.5.16
2+
* jquery.dgtable 0.5.17
33
* git://github.com/danielgindi/jquery.dgtable.git
44
*/
55

@@ -121,7 +121,7 @@ return /******/ (function(modules) { // webpackBootstrap
121121
* @expose
122122
* @type {string}
123123
*/
124-
DGTable.VERSION = '0.5.16';
124+
DGTable.VERSION = '0.5.17';
125125

126126
/**
127127
* @public
@@ -1214,7 +1214,8 @@ return /******/ (function(modules) { // webpackBootstrap
12141214
p = that.p;
12151215

12161216
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);
12181219
}
12191220
return this;
12201221
};
@@ -1394,7 +1395,9 @@ return /******/ (function(modules) { // webpackBootstrap
13941395

13951396
if (currentSort.length) {
13961397
p.rows.sort(!!p.filteredRows);
1397-
this._refilter();
1398+
if (p.filteredRows) {
1399+
p.filteredRows.sort(!!p.filteredRows);
1400+
}
13981401
}
13991402

14001403
// Build output for event, with option names that will survive compilers
@@ -1430,8 +1433,10 @@ return /******/ (function(modules) { // webpackBootstrap
14301433
p.rows.sortColumn = currentSort;
14311434
if (currentSort.length) {
14321435
p.rows.sort(!!p.filteredRows);
1436+
if (p.filteredRows) {
1437+
p.filteredRows.sort(!!p.filteredRows);
1438+
}
14331439
}
1434-
this._refilter();
14351440

14361441
// Build output for event, with option names that will survive compilers
14371442
var sorts = [];

0 commit comments

Comments
 (0)