mirror of
https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git
synced 2026-01-11 13:33:21 -08:00
complete the merge
This commit is contained in:
parent
acf03b3841
commit
c1a1050835
4 changed files with 17 additions and 17 deletions
|
|
@ -23,7 +23,6 @@ type LocationState = MastodonLocationState | null | undefined;
|
|||
type HistoryPath = Path | LocationDescriptor<LocationState>;
|
||||
|
||||
const browserHistory = createBrowserHistory<LocationState>();
|
||||
const originalPush = browserHistory.push.bind(browserHistory);
|
||||
const originalReplace = browserHistory.replace.bind(browserHistory);
|
||||
|
||||
export function useAppHistory() {
|
||||
|
|
@ -49,11 +48,7 @@ function normalizePath(
|
|||
);
|
||||
}
|
||||
|
||||
if (layoutFromWindow() === 'multi-column' && !path.startsWith('/deck')) {
|
||||
originalPush(`/deck${path}`, state);
|
||||
} else {
|
||||
originalPush(path, state);
|
||||
}
|
||||
return location;
|
||||
}
|
||||
|
||||
browserHistory.replace = (path: HistoryPath, state?: MastodonLocationState) => {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue