ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

client/search: fix autocomplete for composite queries

Browse source 
Fixes #342
This commit is contained in:
Shyam Sunder 2020-08-22 10:17:59 -04:00
parent 4595f9a2aa
commit 74c97efdef
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
client/js/controls/auto_complete_control.js
View file

@ -62,13 +62,16 @@ class AutoCompleteControl {
let prefix = ""; let prefix = "";
let suffix = this._sourceInputNode.value.substring(start); let suffix = this._sourceInputNode.value.substring(start);
let middle = this._sourceInputNode.value.substring(0, start); let middle = this._sourceInputNode.value.substring(0, start);
const index = middle.lastIndexOf(" "); const spaceIndex = middle.lastIndexOf(" ");
const commaIndex = middle.lastIndexOf(",");
const index = spaceIndex < commaIndex ? commaIndex : spaceIndex;
const delimiter = spaceIndex < commaIndex ? "" : " ";
if (index !== -1) { if (index !== -1) {
prefix = this._sourceInputNode.value.substring(0, index + 1); prefix = this._sourceInputNode.value.substring(0, index + 1);
middle = this._sourceInputNode.value.substring(index + 1); middle = this._sourceInputNode.value.substring(index + 1);
} }
this._sourceInputNode.value = this._sourceInputNode.value =
prefix + result.toString() + " " + suffix.trimLeft(); prefix + result.toString() + delimiter + suffix.trimLeft();
if (!addSpace) { if (!addSpace) {
this._sourceInputNode.value = this._sourceInputNode.value.trim(); this._sourceInputNode.value = this._sourceInputNode.value.trim();
} }