mirror of
https://github.com/squidfunk/mkdocs-material.git
synced 2024-06-14 11:52:32 +03:00
Added header component and fixed search on 404 page (again)
This commit is contained in:
parent
189473867c
commit
1f64cd481d
42
src/assets/javascripts/components2/header/index.ts
Normal file
42
src/assets/javascripts/components2/header/index.ts
Normal file
@ -0,0 +1,42 @@
|
||||
/*
|
||||
* Copyright (c) 2016-2020 Martin Donath <martin.donath@squidfunk.com>
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to
|
||||
* deal in the Software without restriction, including without limitation the
|
||||
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
* sell copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
* IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
import { OperatorFunction, pipe } from "rxjs"
|
||||
import { shareReplay, switchMap } from "rxjs/operators"
|
||||
|
||||
import { Header, watchHeader } from "observables"
|
||||
|
||||
/* ----------------------------------------------------------------------------
|
||||
* Functions
|
||||
* ------------------------------------------------------------------------- */
|
||||
|
||||
/**
|
||||
* Mount header from source observable
|
||||
*
|
||||
* @return Header observable
|
||||
*/
|
||||
export function mountHeader(): OperatorFunction<HTMLElement, Header> {
|
||||
return pipe(
|
||||
switchMap(watchHeader),
|
||||
shareReplay(1)
|
||||
)
|
||||
}
|
@ -21,6 +21,7 @@
|
||||
*/
|
||||
|
||||
export * from "./_"
|
||||
export * from "./header"
|
||||
export * from "./main"
|
||||
export * from "./navigation"
|
||||
export * from "./search"
|
||||
|
@ -45,6 +45,22 @@ interface SetupOptions {
|
||||
base: string /* Base url */
|
||||
}
|
||||
|
||||
/* ----------------------------------------------------------------------------
|
||||
* Helper functions
|
||||
* ------------------------------------------------------------------------- */
|
||||
|
||||
/**
|
||||
* Resolve URL
|
||||
*
|
||||
* @param base - Base URL
|
||||
* @param paths - Further URL paths
|
||||
*
|
||||
* @return Absolute URL
|
||||
*/
|
||||
function resolve(base: URL | string, ...paths: string[]) {
|
||||
return [base, ...paths].join("")
|
||||
}
|
||||
|
||||
/* ----------------------------------------------------------------------------
|
||||
* Functions
|
||||
* ------------------------------------------------------------------------- */
|
||||
@ -70,9 +86,9 @@ export function setupSearchWorker(
|
||||
map(message => {
|
||||
if (isSearchResultMessage(message)) {
|
||||
for (const { article, sections } of message.data) {
|
||||
article.location = `${prefix}/${article.location}`
|
||||
article.location = resolve(prefix, article.location)
|
||||
for (const section of sections)
|
||||
section.location = `${prefix}/${section.location}`
|
||||
section.location = resolve(prefix, section.location)
|
||||
}
|
||||
}
|
||||
return message
|
||||
@ -81,7 +97,7 @@ export function setupSearchWorker(
|
||||
|
||||
/* Fetch index and setup search worker */
|
||||
ajax({
|
||||
url: `${base}/search/search_index.json`,
|
||||
url: resolve(prefix, "search/search_index.json"),
|
||||
responseType: "json",
|
||||
withCredentials: true
|
||||
})
|
||||
|
Loading…
Reference in New Issue
Block a user