fix linting and small bugs

lineupjs · Mar 18, 2020 · e69e441 · e69e441
1 parent c8e6e46
commit e69e441
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 22 deletions.
diff --git a/src/model/internal.ts b/src/model/internal.ts
@@ -10,8 +10,8 @@ export function integrateDefaults<T>(desc: T, defaults: Partial<T> = {}) {
     const typed = <keyof T>key;
     if (typeof desc[typed] === 'undefined') {
       (<any>desc)[typed] = defaults[typed];
-    };
-  })
+    }
+  });
   return desc;
 }
 

diff --git a/src/renderer/HistogramCellRenderer.ts b/src/renderer/HistogramCellRenderer.ts
@@ -124,7 +124,7 @@ export function createNumberFilter(col: INumberColumn & IMapAbleColumn, parent:
   const renderer = getHistDOMRenderer(col);
   const fContext = createFilterContext(col, context);
 
-  parent.innerHTML = renderer.template + filteredHistTemplate(fContext, createFilterInfo(col)) + '</div>';
+  parent.innerHTML = `${renderer.template}${filteredHistTemplate(fContext, createFilterInfo(col))}</div>`;
   const summaryNode = <HTMLElement>parent.firstElementChild!;
   summaryNode.classList.add(cssClass('summary'), cssClass('renderer'));
   summaryNode.dataset.renderer = 'histogram';
@@ -155,13 +155,14 @@ export function createNumberFilter(col: INumberColumn & IMapAbleColumn, parent:
         return;
       }
       renderer.render(summaryNode, summary, data);
-    })
-    if (ready) {
-      summaryNode.classList.add(engineCssClass('loading'));
-      ready.then(() => {
-        summaryNode.classList.remove(engineCssClass('loading'));
-      });
+    });
+    if (!ready) {
+      return;
     }
+    summaryNode.classList.add(engineCssClass('loading'));
+    ready.then(() => {
+      summaryNode.classList.remove(engineCssClass('loading'));
+    });
   };
   rerender();
 
@@ -172,7 +173,7 @@ export function createNumberFilter(col: INumberColumn & IMapAbleColumn, parent:
     submit() {
       applyFilter(currentFilter.filterMissing, currentFilter.filterMin, currentFilter.filterMax);
     }
-  }
+  };
 }
 
 /** @internal */

diff --git a/src/ui/dialogs/APopup.ts b/src/ui/dialogs/APopup.ts
@@ -1,4 +1,4 @@
-import ADialog, {IDialogContext, IDialogOptions} from "./ADialog";
+import ADialog, {IDialogContext, IDialogOptions} from './ADialog';
 
 abstract class APopup extends ADialog {
   constructor(dialog: Readonly<IDialogContext>, options: Partial<IDialogOptions> = {}) {
@@ -12,11 +12,11 @@ abstract class APopup extends ADialog {
   }
 
   protected reset() {
-
+    // dummy
   }
 
   protected cancel() {
-
+    // dummy
   }
 }
 

diff --git a/src/ui/dialogs/BooleanFilterDialog.ts b/src/ui/dialogs/BooleanFilterDialog.ts
@@ -9,7 +9,9 @@ export default class BooleanFilterDialog extends ADialog {
   private readonly before: boolean | null;
 
   constructor(private readonly column: BooleanColumn, dialog: IDialogContext) {
-    super(dialog);
+    super(dialog, {
+      livePreview: dialog.manager.liveFilterPreviews
+    });
     this.before = this.column.getFilter();
   }
 

diff --git a/src/ui/dialogs/CategoricalMappingFilterDialog.ts b/src/ui/dialogs/CategoricalMappingFilterDialog.ts
@@ -12,7 +12,9 @@ export default class CategoricalMappingFilterDialog extends ADialog {
   private readonly before: ICategoricalFilter;
 
   constructor(private readonly column: OrdinalColumn, dialog: IDialogContext) {
-    super(dialog);
+    super(dialog, {
+      livePreview: dialog.manager.liveFilterPreviews
+    });
     this.before = this.column.getFilter() || {filter: this.column.categories.map((d) => d.name), filterMissing: false};
   }
 

diff --git a/src/ui/dialogs/NumberFilterDialog.ts b/src/ui/dialogs/NumberFilterDialog.ts
@@ -10,7 +10,9 @@ export default class NumberFilterDialog extends ADialog {
   private handler: {reset: () => void, submit: () => void} | null = null;
 
   constructor(private readonly column: IMapAbleColumn, dialog: IDialogContext, private readonly ctx: IRankingHeaderContext) {
-    super(dialog);
+    super(dialog, {
+      livePreview: dialog.manager.liveFilterPreviews
+    });
 
     this.before = column.getFilter();
   }

diff --git a/src/ui/dialogs/RenameDialog.ts b/src/ui/dialogs/RenameDialog.ts
@@ -26,9 +26,9 @@ export default class RenameDialog extends ADialog {
       label: desc.label || this.column.id,
       summary: desc.summary || '',
       description: desc.description || ''
-    }
+    };
     this.findInput('input[type="text"]').value = meta.label;
-    this.findInput('input[name="summary"]').value = meta.summary
+    this.findInput('input[name="summary"]').value = meta.summary;
     this.node.querySelector('textarea')!.value = meta.description;
   }
 

diff --git a/src/ui/dialogs/SearchDialog.ts b/src/ui/dialogs/SearchDialog.ts
@@ -16,7 +16,7 @@ export default class SearchDialog extends ADialog {
     const input = <HTMLInputElement>node.querySelector('input[type="text"]')!;
     const checkbox = <HTMLInputElement>node.querySelector('input[type="checkbox"]')!;
     const update = () => {
-      let search: any = input.value;
+      const search: any = input.value;
       if (search.length < 3) {
         input.setCustomValidity('at least 3 characters');
         return;

diff --git a/src/ui/dialogs/groupNumber.ts b/src/ui/dialogs/groupNumber.ts
@@ -65,8 +65,8 @@ export default function groupNumber(col: NumberColumn, node: HTMLElement, dialog
       threshold.value = value.toString();
       threshold.disabled = false;
       bins.value = getNumberOfBins(ranking.getOrderLength()).toString();
-      bins.disabled = false;
+      bins.disabled = true;
       node.querySelector<HTMLInputElement>('input[name=threshold][value=threshold]')!.checked = true;
     }
-  }
+  };
 }
diff --git a/src/ui/dialogs/utils.ts b/src/ui/dialogs/utils.ts
@@ -47,7 +47,7 @@ export function sortMethods(node: HTMLElement, column: {setSortMethod(v: string)
     reset() {
       node.querySelector<HTMLInputElement>(`input[name=multivaluesort][value="${bak}"]`)!.checked = true;
     }
-  }
+  };
 }