Skip to content

Commit

Permalink
Merge branch 'uiux' into datatablesfilters
Browse files Browse the repository at this point in the history
  • Loading branch information
droberts-ctrlo authored Nov 3, 2023
2 parents 19ac9ca + cd72a25 commit 8a74991
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/frontend/components/data-table/lib/component.js
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,6 @@ class DataTableComponent extends Component {
if (self.searchParams.has(id)) {
column.search(self.searchParams.get(id)).draw()
}

self.addSearchDropdown(column, id, index)
}
})
Expand Down Expand Up @@ -720,7 +719,7 @@ class DataTableComponent extends Component {
this.initializingTable = true
const $dataTableContainer = this.el.parent()

$dataTableContainer.addClass('data-table__container--scrollable');
$dataTableContainer.addClass('data-table__container--scrollable')
// // See comments above regarding preventing multiple clicks
this.el.DataTable().button(0).disable();
this.el.closest('.dataTables_wrapper').find('.btn-toggle-off').toggleClass(['btn-toggle', 'btn-toggle-off'])
Expand All @@ -730,7 +729,7 @@ class DataTableComponent extends Component {
conf.responsive = this.originalResponsiveObj
this.el.DataTable().destroy();
this.el.DataTable(conf)
this.initializingTable = true;
this.initializingTable = true
// See comments above regarding preventing multiple clicks
this.el.DataTable().button(0).disable();
}
Expand Down

0 comments on commit 8a74991

Please sign in to comment.