Skip to content

Commit

Permalink
ignore empty strings
Browse files Browse the repository at this point in the history
  • Loading branch information
sgratzl committed Mar 26, 2020
1 parent 46ade55 commit 1333e86
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions src/ui/dialogs/StringFilterDialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ import {cssClass} from '../../styles';
import {debounce} from '../../internal';


function toInput(text: string, isRegex: boolean) {
const v = text.trim();
if (v === '') {
return null;
}
return isRegex ? new RegExp(v, 'gm') : v;
}


/** @internal */
export default class StringFilterDialog extends ADialog {

Expand All @@ -20,7 +29,7 @@ export default class StringFilterDialog extends ADialog {
}

private updateFilter(filter: string | RegExp | null, filterMissing: boolean) {
updateFilterState(this.attachment, this.column, filterMissing || (filter != null && filter !== ''));
updateFilterState(this.attachment, this.column, filterMissing || filter != null);
this.column.setFilter({filter, filterMissing});
}

Expand All @@ -41,7 +50,7 @@ export default class StringFilterDialog extends ADialog {
const filterMissing = findFilterMissing(this.node).checked;
const input = this.findInput('input[type="text"]').value;
const isRegex = this.findInput('input[type="checkbox"]').checked;
this.updateFilter(isRegex ? new RegExp(input, 'gm') : input, filterMissing);
this.updateFilter(toInput(input, isRegex), filterMissing);
return true;
}

Expand Down

0 comments on commit 1333e86

Please sign in to comment.