Quick repair of datatables

happeninghq · Jul 2, 2016 · 27e33af · 27e33af
1 parent f56e7b2
commit 27e33af
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/assets/js/blocks/data-table.js b/src/assets/js/blocks/data-table.js
@@ -12,7 +12,9 @@ export const init = () => {
     const $this = $(this);
 
     $this.data('setup-datatable', () => {
-      $this.dataTable();
+      $this.dataTable({
+        "dom": 'rtip'
+      });
     });
 
     $this.data('destroy-datatable', () => {
@@ -25,6 +27,7 @@ export const init = () => {
     });
 
     $this.data('setup-datatable')();
+    $this[0].dispatchEvent(new CustomEvent('datatable-initialised'));
   });
 };
 
diff --git a/src/assets/js/blocks/form/filter-form.js b/src/assets/js/blocks/form/filter-form.js
@@ -101,16 +101,19 @@ export const init = () => {
     const $this = $(this);
     const filter = $($this.data('filter'));
 
-    let f = null;
+    const bindToF = (f) => {
+      $this.find('input').keyup(f.filter);
+      $this.find('input').change(f.filter);
+
+      $this.find('.filter-form__reset').click(f.resetFilter);
+    }
+
     if (filter.hasClass('data-table')) {
-      f = bindFilterToDataTable($this, filter.dataTable());
+      filter[0].addEventListener('datatable-initialised', () => {
+        bindToF(bindFilterToDataTable($this, filter.DataTable()));
+      });
     } else if (filter.hasClass('searchable-list')) {
-      f = bindFilterToSearchableList($this, filter.data('searchable-list'));
+      bindToF(bindFilterToSearchableList($this, filter.data('searchable-list')));
     }
-
-    $this.find('input').keyup(f.filter);
-    $this.find('input').change(f.filter);
-
-    $this.find('.filter-form__reset').click(f.resetFilter);
   });
 };