Fixed search for use_directory_urls: false

This commit is contained in:
squidfunk
2020-02-29 10:47:01 +01:00
parent ff9ef6a4a7
commit 68c9cb6dac
9 changed files with 49 additions and 45 deletions

View File

@@ -28,11 +28,10 @@ import {
pluck,
share,
skip,
startWith,
switchMap
} from "rxjs/operators"
import { getLocation, setLocation } from "../../location"
import { setLocation } from "../../location"
/* ----------------------------------------------------------------------------
* Helper types
@@ -52,7 +51,7 @@ interface WatchOptions {
/**
* Watch document switch
*
* This function returns an observables that fetches a document if the provided // TODO: update docs
* This function returns an observables that fetches a document if the provided
* location observable emits a new value (i.e. URL). If the emitted URL points
* to the same page, the request is effectively ignored (i.e. when only the
* fragment identifier changes).
@@ -68,7 +67,6 @@ export function watchDocumentSwitch(
): Observable<Document> {
return location$
.pipe(
startWith(getLocation()),
distinctUntilKeyChanged("pathname"),
skip(1),

View File

@@ -20,7 +20,7 @@
* IN THE SOFTWARE.
*/
import { Subject } from "rxjs"
import { BehaviorSubject } from "rxjs"
/* ----------------------------------------------------------------------------
* Functions
@@ -56,6 +56,6 @@ export function setLocation(url: URL): void {
*
* @return Location subject
*/
export function watchLocation(): Subject<URL> {
return new Subject<URL>()
export function watchLocation(): BehaviorSubject<URL> {
return new BehaviorSubject<URL>(getLocation())
}