alex/yomichan
1
Fork 0
Code Releases Activity

simplify setQuery kana conversion

Browse Source
This commit is contained in:
siikamiika 2020-02-09 21:47:11 +02:00
parent 4e59c2d556
commit 21bad6c6e3
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,22 +69,17 @@ class DisplaySearch extends Display {
const {query=''} = DisplaySearch.parseQueryStringFromLocation(window.location.href); const {query=''} = DisplaySearch.parseQueryStringFromLocation(window.location.href);
if (e.target.checked) { if (e.target.checked) {
window.wanakana.bind(this.query); window.wanakana.bind(this.query);
this.setQuery(window.wanakana.toKana(query));
apiOptionsSet({general: {enableWanakana: true}}, this.getOptionsContext()); apiOptionsSet({general: {enableWanakana: true}}, this.getOptionsContext());
} else { } else {
window.wanakana.unbind(this.query); window.wanakana.unbind(this.query);
this.setQuery(query);
apiOptionsSet({general: {enableWanakana: false}}, this.getOptionsContext()); apiOptionsSet({general: {enableWanakana: false}}, this.getOptionsContext());
} }
this.setQuery(query);
this.onSearchQueryUpdated(this.query.value, false); this.onSearchQueryUpdated(this.query.value, false);
}); });
} }
if (this.isWanakanaEnabled()) { this.setQuery(query);
this.setQuery(window.wanakana.toKana(query));
} else {
this.setQuery(query);
}
this.onSearchQueryUpdated(this.query.value, false); this.onSearchQueryUpdated(this.query.value, false);
} }
if (this.clipboardMonitorEnable !== null && mode !== 'popup') { if (this.clipboardMonitorEnable !== null && mode !== 'popup') {
@ -164,12 +159,7 @@ class DisplaySearch extends Display {
onPopState() { onPopState() {
const {query='', mode=''} = DisplaySearch.parseQueryStringFromLocation(window.location.href); const {query='', mode=''} = DisplaySearch.parseQueryStringFromLocation(window.location.href);
document.documentElement.dataset.searchMode = mode; document.documentElement.dataset.searchMode = mode;
if (this.isWanakanaEnabled()) { this.setQuery(query);
this.setQuery(window.wanakana.toKana(query));
} else {
this.setQuery(query);
}
this.onSearchQueryUpdated(this.query.value, false); this.onSearchQueryUpdated(this.query.value, false);
} }
@ -203,7 +193,7 @@ class DisplaySearch extends Display {
} }
onClipboardText(text) { onClipboardText(text) {
this.setQuery(this.isWanakanaEnabled() ? window.wanakana.toKana(text) : text); this.setQuery(text);
window.history.pushState(null, '', `${window.location.pathname}?query=${encodeURIComponent(text)}`); window.history.pushState(null, '', `${window.location.pathname}?query=${encodeURIComponent(text)}`);
this.onSearchQueryUpdated(this.query.value, true); this.onSearchQueryUpdated(this.query.value, true);
} }
@ -256,8 +246,9 @@ class DisplaySearch extends Display {
} }
setQuery(query) { setQuery(query) {
this.query.value = query; const interpretedQuery = this.isWanakanaEnabled() ? window.wanakana.toKana(query) : query;
this.queryParser.setText(query); this.query.value = interpretedQuery;
this.queryParser.setText(interpretedQuery);
} }
setIntroVisible(visible, animate) { setIntroVisible(visible, animate) {