alex/yomichan
1
Fork 0
Code Releases Activity

Organize, remove unnecessary null checks

Browse Source
This commit is contained in:
toasted-nutbread 2020-02-26 19:08:35 -05:00
parent 0c1b250b4f
commit 007789ffa0
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ext/bg/js/search.js
View File

@ -55,27 +55,19 @@ class DisplaySearch extends Display {
const {queryParams: {query='', mode=''}} = parseUrl(window.location.href); const {queryParams: {query='', mode=''}} = parseUrl(window.location.href);
if (this.search !== null) { document.documentElement.dataset.searchMode = mode;
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);
if (this.wanakanaEnable !== null) { if (this.options.general.enableWanakana === true) {
if (this.options.general.enableWanakana === true) { this.wanakanaEnable.checked = true;
this.wanakanaEnable.checked = true; window.wanakana.bind(this.query);
window.wanakana.bind(this.query); } else {
} else { this.wanakanaEnable.checked = false;
this.wanakanaEnable.checked = false;
}
this.wanakanaEnable.addEventListener('change', (e) => this.onWanakanaEnableChange(e));
}
this.setQuery(query);
this.onSearchQueryUpdated(this.query.value, 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) { if (this.options.general.enableClipboardMonitor === true) {
this.clipboardMonitorEnable.checked = true; this.clipboardMonitorEnable.checked = true;
this.clipboardMonitor.start(); this.clipboardMonitor.start();
@ -87,6 +79,9 @@ class DisplaySearch extends Display {
chrome.runtime.onMessage.addListener(this.onRuntimeMessage.bind(this)); 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('popstate', (e) => this.onPopState(e));
window.addEventListener('copy', (e) => this.onCopy(e)); window.addEventListener('copy', (e) => this.onCopy(e));