e2m/dispatch
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use replaceState for /connect redirects

Browse source
This commit is contained in:
khlieng 2015-05-05 00:46:12 +02:00
parent d440aac023
commit deba58dbff
4 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/js/app.js
View file

@ -15,7 +15,7 @@ var routeActions = require('./actions/route');
var uuid = localStorage.uuid; var uuid = localStorage.uuid;
if (!uuid) { if (!uuid) {
routeActions.navigate('connect'); routeActions.navigate('connect', true);
localStorage.uuid = uuid = util.UUID(); localStorage.uuid = uuid = util.UUID();
} }

6
client/src/js/components/App.jsx
View file

@ -13,8 +13,12 @@ var App = React.createClass({
Reflux.listenTo(routeActions.navigate, 'navigate') Reflux.listenTo(routeActions.navigate, 'navigate')
], ],
navigate: function(path) { navigate: function(path, replace) {
if (!replace) {
this.transitionTo(path); this.transitionTo(path);
} else {
this.replaceWith(path);
}
}, },
render: function() { render: function() {

2
client/src/js/irc.js
View file

@ -75,7 +75,7 @@ socket.on('servers', function(data) {
window.loaded = true; window.loaded = true;
if (data === null) { if (data === null) {
routeActions.navigate('connect'); routeActions.navigate('connect', true);
} }
serverActions.load(data); serverActions.load(data);

36
server/bindata.go
View file

File diff suppressed because one or more lines are too long