mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-18 22:22:10 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix onNewScreen to use replace when going from roomId->roomAlias to prevent locking the user in place

Browse source
This commit is contained in:
Michael Telatynski 2020-09-09 16:52:48 +01:00
parent eaa46d1794
commit ac447fd318
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/vector/app.tsx
View file

@ -71,11 +71,16 @@ function onHashChange(ev: HashChangeEvent) {
// This will be called whenever the SDK changes screens, // This will be called whenever the SDK changes screens,
// so a web page can update the URL bar appropriately. // so a web page can update the URL bar appropriately.
function onNewScreen(screen: string) { function onNewScreen(screen: string, replaceLast = false) {
console.log("newscreen " + screen); console.log("newscreen " + screen);
const hash = '#/' + screen; const hash = '#/' + screen;
lastLocationHashSet = hash; lastLocationHashSet = hash;
window.location.hash = hash;
if (replaceLast) {
window.location.replace(hash);
} else {
window.location.assign(hash);
}
} }
// We use this to work out what URL the SDK should // We use this to work out what URL the SDK should