From 007789ffa07149daeeb857ae3587aa4a0da85c40 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Wed, 26 Feb 2020 19:08:35 -0500 Subject: [PATCH] Organize, remove unnecessary null checks --- ext/bg/js/search.js | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/ext/bg/js/search.js b/ext/bg/js/search.js index 59cb8636..209a5feb 100644 --- a/ext/bg/js/search.js +++ b/ext/bg/js/search.js @@ -55,27 +55,19 @@ class DisplaySearch extends Display { const {queryParams: {query='', mode=''}} = parseUrl(window.location.href); - if (this.search !== null) { - this.search.addEventListener('click', (e) => this.onSearch(e), false); - } - if (this.query !== null) { - document.documentElement.dataset.searchMode = mode; - this.query.addEventListener('input', () => this.onSearchInput(), false); + document.documentElement.dataset.searchMode = mode; - if (this.wanakanaEnable !== null) { - if (this.options.general.enableWanakana === true) { - this.wanakanaEnable.checked = true; - window.wanakana.bind(this.query); - } else { - this.wanakanaEnable.checked = false; - } - this.wanakanaEnable.addEventListener('change', (e) => this.onWanakanaEnableChange(e)); - } - - this.setQuery(query); - this.onSearchQueryUpdated(this.query.value, false); + if (this.options.general.enableWanakana === true) { + this.wanakanaEnable.checked = true; + window.wanakana.bind(this.query); + } else { + this.wanakanaEnable.checked = false; } - if (this.clipboardMonitorEnable !== null && mode !== 'popup') { + + this.setQuery(query); + this.onSearchQueryUpdated(this.query.value, false); + + if (mode !== 'popup') { if (this.options.general.enableClipboardMonitor === true) { this.clipboardMonitorEnable.checked = true; this.clipboardMonitor.start(); @@ -87,6 +79,9 @@ class DisplaySearch extends Display { chrome.runtime.onMessage.addListener(this.onRuntimeMessage.bind(this)); + this.search.addEventListener('click', (e) => this.onSearch(e), false); + this.query.addEventListener('input', () => this.onSearchInput(), false); + this.wanakanaEnable.addEventListener('change', (e) => this.onWanakanaEnableChange(e)); window.addEventListener('popstate', (e) => this.onPopState(e)); window.addEventListener('copy', (e) => this.onCopy(e));