systemausfall.org/hugo-theme-hilfe
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: fix asset loading on subfolder deployments (#287)

Browse source
This commit is contained in:
Robert Kaussow 2022-01-16 16:03:31 +01:00 • committed by GitHub
parent 367d2b8a7c
commit cdc8c1faed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/js/search.js
View file

@ -5,6 +5,7 @@ const { Validator } = require("@cfworker/json-schema")
document.addEventListener("DOMContentLoaded", function (event) {
const input = document.querySelector("#gdoc-search-input")
const results = document.querySelector("#gdoc-search-results")
const basePath = urlPath(input ? input.dataset.siteBaseUrl : "")
const configSchema = {
type: "object",
@ -23,7 +24,9 @@ document.addEventListener("DOMContentLoaded", function (event) {
}
const validator = new Validator(configSchema)
getJson("/search/config.min.json", function (searchConfig) {
if (!input) return
getJson(combineURLs(basePath, "/search/config.min.json"), function (searchConfig) {
const validationResult = validator.validate(searchConfig)
if (!validationResult.valid)
@ -193,3 +196,24 @@ function flattenHits(results) {
return items
}
function urlPath(rawURL) {
var parser = document.createElement("a")
parser.href = rawURL
return parser.pathname
}
/**
* Part of [axios](https://github.com/axios/axios/blob/master/lib/helpers/combineURLs.js).
* Creates a new URL by combining the specified URLs
*
* @param {string} baseURL The base URL
* @param {string} relativeURL The relative URL
* @returns {string} The combined URL
*/
function combineURLs(baseURL, relativeURL) {
return relativeURL
? baseURL.replace(/\/+$/, "") + "/" + relativeURL.replace(/^\/+/, "")
: baseURL
}