Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix browser history getting stuck looping back to the same room #18053

Merged
merged 2 commits into from
Jul 19, 2021
Merged

Fix browser history getting stuck looping back to the same room #18053

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b23aad2
Fix browser history getting stuck looping back to the same room
t3chguy Jul 19, 2021
331678b
fix edge case around event permalinks
t3chguy Jul 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/vector/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,14 @@ function onNewScreen(screen: string, replaceLast = false) {
const hash = '#/' + screen;
lastLocationHashSet = hash;

// if the new hash is a substring of the old one then we are stripping fields e.g `via` so replace history
if (screen.startsWith("room/") &&
window.location.hash.includes("/$") === hash.includes("/$") && // only if both did or didn't contain event link
window.location.hash.startsWith(hash)
) {
replaceLast = true;
}

if (replaceLast) {
window.location.replace(hash);
} else {
Expand Down