alex/yomichan
1
Fork 0
Code Releases Activity

Improve query parser scanning (#1154)

Browse Source 
* Improve how the search page updates after settings have changed

* Always update the history on the first scan of the query parser
This commit is contained in:
toasted-nutbread 2020-12-21 19:19:59 -05:00 committed by GitHub
parent 9dd2a9c98e
commit 18043babeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,7 +144,7 @@ class DisplaySearch extends Display {
await this.updateOptions();
const query = this._queryInput.value;
if (query) {
this._search(false, false);
this.searchLast();
}
}

41
ext/mixed/js/display.js
View File

@ -71,6 +71,8 @@ class Display extends EventDispatcher {
this._contentType = 'clear';
this._defaultTitle = document.title;
this._titleMaxLength = 1000;
this._query = '';
this._rawQuery = '';
this._fullQuery = '';
this._documentUtil = new DocumentUtil();
this._progressIndicator = document.querySelector('#progress-indicator');
@ -459,6 +461,31 @@ class Display extends EventDispatcher {
this._updateFocusedElement();
}
searchLast() {
const type = this._contentType;
if (type === 'clear') { return; }
const query = this._rawQuery;
const state = (
this._historyHasState() ?
clone(this._history.state) :
{
focusEntry: 0,
sentence: {text: query, offset: 0},
url: window.location.href
}
);
const details = {
focus: false,
history: false,
params: this._createSearchParams(type, query, false),
state,
content: {
definitions: null
}
};
this.setContent(details);
}
// Message handlers
_onMessage({action, params}, sender, callback) {
@ -560,6 +587,8 @@ class Display extends EventDispatcher {
let clear = true;
this._historyHasChanged = true;
this._contentType = type;
this._query = '';
this._rawQuery = '';
const eventArgs = {type, urlSearchParams, token};
// Set content
@ -570,9 +599,11 @@ class Display extends EventDispatcher {
let query = urlSearchParams.get('query');
if (!query) { break; }
this._query = query;
clear = false;
const isTerms = (type === 'terms');
query = this.postProcessQuery(query);
this._rawQuery = query;
let queryFull = urlSearchParams.get('full');
queryFull = (queryFull !== null ? this.postProcessQuery(queryFull) : query);
const wildcardsEnabled = (urlSearchParams.get('wildcards') !== 'off');
@ -611,14 +642,20 @@ class Display extends EventDispatcher {
_onQueryParserSearch({type, definitions, sentence, inputInfo: {cause}, textSource, optionsContext}) {
const query = textSource.text();
const history = (cause === 'click');
const historyState = this._history.state;
const history = (
cause === 'click' ||
!isObject(historyState) ||
historyState.cause !== 'queryParser'
);
const details = {
focus: false,
history,
params: this._createSearchParams(type, query, false),
state: {
sentence,
optionsContext
optionsContext,
cause: 'queryParser'
},
content: {
definitions