Merge pull request #675 from aaronkvanmeerten/master

Only push to history with present page URL plus room name
This commit is contained in:
hristoterezov
2016-06-03 14:13:49 -05:00
+3 -8
View File
@@ -51,14 +51,9 @@ function buildRoomName () {
if(!roomName) {
let word = RoomnameGenerator.generateRoomWithoutSeparator();
roomName = word.toLowerCase();
let historyURL = window.location.pathname + word;
//Trying to push state with URL "/" + roomName
var err = pushHistoryState(word, historyURL);
//If URL "/" + roomName is not good, trying with explicitly adding the
//domain name.
if(err && config.hosts.domain) {
pushHistoryState(word, "//" + config.hosts.domain + historyURL);
}
let historyURL = window.location.href + word;
//Trying to push state with current URL + roomName
pushHistoryState(word, historyURL);
}
return roomName;