Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-22 12:17:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Ensure page is reloaded correctly when a hash is present (#8096)

Browse Source 
To demonstrate the issue:
- Visit https://meta.discourse.org/#somethingHere while logged in
- Click "log out"
- You will be logged out, but the page will not be reloaded

Setting `window.location.pathname = "/"` will not reload the page if there is a hash present. Using `window.location = "/"` gives us the desired behavior.
This commit is contained in:
David Taylor 2019-09-16 13:27:12 +01:00 committed by GitHub
parent e0a403edfc
commit 39f7e98b60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/models/backup.js.es6
View File

@ -63,7 +63,7 @@ Backup.reopenClass({
bootbox.alert(result.message); bootbox.alert(result.message);
} else { } else {
// redirect to homepage (session might be lost) // redirect to homepage (session might be lost)
window.location.pathname = Discourse.getURL("/"); window.location = Discourse.getURL("/");
} }
}); });
} }

2
app/assets/javascripts/admin/routes/admin-backups.js.es6
View File

@ -36,7 +36,7 @@ export default Discourse.Route.extend({
); );
if (log.operation === "restore") { if (log.operation === "restore") {
// redirect to homepage when the restore is done (session might be lost) // redirect to homepage when the restore is done (session might be lost)
window.location.pathname = Discourse.getURL("/"); window.location = Discourse.getURL("/");
} }
} else { } else {
this.controllerFor("adminBackupsLogs") this.controllerFor("adminBackupsLogs")

2
app/assets/javascripts/discourse/controllers/login.js.es6
View File

@ -349,7 +349,7 @@ export default Ember.Controller.extend(ModalFunctionality, {
$.removeCookie("destination_url"); $.removeCookie("destination_url");
window.location.href = destinationUrl; window.location.href = destinationUrl;
} else if (window.location.pathname === Discourse.getURL("/login")) { } else if (window.location.pathname === Discourse.getURL("/login")) {
window.location.pathname = Discourse.getURL("/"); window.location = Discourse.getURL("/");
} else { } else {
window.location.reload(); window.location.reload();
} }

4
app/assets/javascripts/discourse/controllers/preferences/account.js.es6
View File

@ -190,7 +190,7 @@ export default Ember.Controller.extend(
() => { () => {
bootbox.alert( bootbox.alert(
I18n.t("user.deleted_yourself"), I18n.t("user.deleted_yourself"),
() => (window.location.pathname = Discourse.getURL("/")) () => (window.location = Discourse.getURL("/"))
); );
}, },
() => { () => {
@ -238,7 +238,7 @@ export default Ember.Controller.extend(
if (!token) { if (!token) {
const redirect = this.siteSettings.logout_redirect; const redirect = this.siteSettings.logout_redirect;
if (Ember.isEmpty(redirect)) { if (Ember.isEmpty(redirect)) {
window.location.pathname = Discourse.getURL("/"); window.location = Discourse.getURL("/");
} else { } else {
window.location.href = redirect; window.location.href = redirect;
} }

2
app/assets/javascripts/discourse/lib/logout.js.es6
View File

@ -9,7 +9,7 @@ export default function logout(siteSettings, keyValueStore) {
const redirect = siteSettings.logout_redirect; const redirect = siteSettings.logout_redirect;
if (Ember.isEmpty(redirect)) { if (Ember.isEmpty(redirect)) {
window.location.pathname = Discourse.getURL("/"); window.location = Discourse.getURL("/");
} else { } else {
window.location.href = redirect; window.location.href = redirect;
} }