supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1080 from thelounge/yamanickill/1042-back-twice

Browse Source 
Replace the state on init rather than adding a new entry
This commit is contained in:
Pavel Djundik 2017-04-26 11:16:43 +03:00 committed by GitHub
commit ba20d4f70e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/js/lounge.js
View File

@ -132,7 +132,9 @@ $(function() {
$("#sign-in").remove(); $("#sign-in").remove();
var id = data.active; var id = data.active;
var target = sidebar.find("[data-id='" + id + "']").trigger("click"); var target = sidebar.find("[data-id='" + id + "']").trigger("click", {
replaceHistory: true
});
if (target.length === 0) { if (target.length === 0) {
var first = sidebar.find(".chan") var first = sidebar.find(".chan")
.eq(0) .eq(0)
@ -820,8 +822,12 @@ $(function() {
} }
if (history && history.pushState) { if (history && history.pushState) {
if (data && data.replaceHistory && history.replaceState) {
history.replaceState(state, null, null);
} else {
history.pushState(state, null, null); history.pushState(state, null, null);
} }
}
}); });
sidebar.on("click", ".chan, button", function() { sidebar.on("click", ".chan, button", function() {