prehistoric-systems/tilde
1
0
Fork 0
mirror of https://github.com/xvvvyz/tilde.git synced 2026-03-11 14:44:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplify formatSearchUrl calls, use URL api

Browse source 
closes: https://github.com/xvvvyz/tilde/issues/33
This commit is contained in:
cade 2024-06-20 11:32:44 -07:00
parent ead7ac906d
commit 609760aa60
No known key found for this signature in database
GPG key ID: 6AC5A902158265D0
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
index.html
View file

@ -331,7 +331,7 @@
});
}
static #formatSearchUrl(commandUrl, searchTemplate, query) {
static #formatSearchUrl(searchTemplate, query, commandUrl) {
if (!searchTemplate) return commandUrl;
const [commandBase] = Search.#splitUrl(commandUrl);
const [searchBase, path] = Search.#splitUrl(searchTemplate);
@ -366,7 +366,7 @@
if (COMMANDS.has(searchKey)) {
const { searchTemplate, url: base } = COMMANDS.get(searchKey);
const search = rawSearch.trim();
const url = Search.#formatSearchUrl(base, searchTemplate, search);
const url = Search.#formatSearchUrl(searchTemplate, search, base);
return { key: searchKey, query, search, splitBy, url };
}
@ -380,17 +380,19 @@
return { key: pathKey, path, query, splitBy, url };
}
const [baseUrl, rest] = Search.#splitUrl(CONFIG.defaultSearchTemplate);
const url = Search.#formatSearchUrl(baseUrl, rest, query);
const url = Search.#formatSearchUrl(CONFIG.defaultSearchTemplate, query);
return { query, search: query, url };
};
static #splitUrl(url) {
const a = document.createElement('a');
a.href = url;
const baseUrl = a.hostname ? `${a.protocol}//${a.hostname}` : null;
const rest = `${a.pathname}${a.search}`;
return [baseUrl, decodeURIComponent(rest)];
try {
const u = new URL(url);
const base = `${u.protocol}//${u.hostname}`;
const rest = decodeURIComponent(`${u.pathname}${u.search}${u.hash}`);
return [base, rest];
} catch (e) {
return [null, url];
}
}
#close() {