Skip to content

Commit 27ddbea

Browse files
authored
[FEATURE] #299 Fix merging of api-state and persisted state (#300)
1 parent 2b25e0d commit 27ddbea

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/Resources/public/js/datatables.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,9 @@
7777
data = null;
7878
if (Object.keys(state).length) {
7979
var api = new $.fn.dataTable.Api( settings );
80-
var merged = $.extend(true, {}, api.state(), state);
81-
80+
var merged = Object.assign({}, api.state(), state)
8281
api
83-
.order(state.order ?? api.state().order)
82+
.order(Array.isArray(merged.order) && merged.order.length > 0 ? merged.order : api.state().order)
8483
.search(merged.search.search)
8584
.page.len(merged.length)
8685
.page(merged.start / merged.length)

0 commit comments

Comments
 (0)