alex/yomichan
1
Fork 0
Code Releases Activity

Remove jQuery usage from search.js

Browse Source
This commit is contained in:
toasted-nutbread 2019-09-15 12:12:30 -04:00
parent 9a243630a5
commit b61fc81012
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,14 +26,20 @@ class DisplaySearch extends Display {
url: window.location.href url: window.location.href
}; };
this.search = $('#search').click(this.onSearch.bind(this)); this.search = document.querySelector('#search');
this.query = $('#query').on('input', this.onSearchInput.bind(this)); this.query = document.querySelector('#query');
this.intro = document.querySelector('#intro'); this.intro = document.querySelector('#intro');
this.introHidden = false; this.introHidden = false;
this.dependencies = Object.assign({}, this.dependencies, {docRangeFromPoint, docSentenceExtract}); this.dependencies = Object.assign({}, this.dependencies, {docRangeFromPoint, docSentenceExtract});
window.wanakana.bind(this.query.get(0)); if (this.search !== null) {
this.search.addEventListener('click', (e) => this.onSearch(e), false);
}
if (this.query !== null) {
this.query.addEventListener('input', () => this.onSearchInput(), false);
window.wanakana.bind(this.query);
}
} }
onError(error) { onError(error) {
@ -41,18 +47,27 @@ class DisplaySearch extends Display {
} }
onSearchClear() { onSearchClear() {
this.query.focus().select(); if (this.query === null) {
return;
}
this.query.focus();
this.query.select();
} }
onSearchInput() { onSearchInput() {
this.search.prop('disabled', this.query.val().length === 0); this.search.disabled = (this.query === null || this.query.value.length === 0);
} }
async onSearch(e) { async onSearch(e) {
if (this.query === null) {
return;
}
try { try {
e.preventDefault(); e.preventDefault();
this.hideIntro(); this.hideIntro();
const {length, definitions} = await apiTermsFind(this.query.val(), this.optionsContext); const {length, definitions} = await apiTermsFind(this.query.value, this.optionsContext);
super.termsShow(definitions, await apiOptionsGet(this.optionsContext)); super.termsShow(definitions, await apiOptionsGet(this.optionsContext));
} catch (e) { } catch (e) {
this.onError(e); this.onError(e);