OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #15127 from vector-im/t3chguy/fix/3543 

Fix onNewScreen to use replace when going from roomId->roomAlias
pull/15153/head
Michael Telatynski 2020-09-11 07:29:12 +01:00 committed by GitHub
parent fa7eaedaa7 ac447fd318
commit a700502086
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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