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

Update client dependencies

Browse source
This commit is contained in:
Ken-Håvard Lieng 2016-03-14 23:22:24 +01:00
parent 42efc20748
commit 81b635a872
18 changed files with 97 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/src/js/actions/message.js
View file

@ -64,7 +64,9 @@ export function addMessages(messages) {
return (dispatch, getState) => {
const state = getState();
messages.forEach(message => initMessage(message, state).time = now);
messages.forEach(message => {
initMessage(message, state).time = now;
});
dispatch({
type: actions.ADD_MESSAGES,

12
client/src/js/actions/tab.js
View file

@ -1,14 +1,14 @@
import { routeActions } from 'react-router-redux';
import { push, replace } from 'react-router-redux';
import * as actions from '../actions';
export function select(server, channel, pm) {
if (pm) {
return routeActions.push(`/${server}/pm/${channel}`);
return push(`/${server}/pm/${channel}`);
} else if (channel) {
return routeActions.push(`/${server}/${encodeURIComponent(channel)}`);
return push(`/${server}/${encodeURIComponent(channel)}`);
}
return routeActions.push(`/${server}`);
return push(`/${server}`);
}
export function updateSelection() {
@ -19,14 +19,14 @@ export function updateSelection() {
const { server } = state.tab.selected;
if (servers.size === 0) {
dispatch(routeActions.replace('/connect'));
dispatch(replace('/connect'));
} else if (history.size > 0) {
const tab = history.last();
dispatch(select(tab.server, tab.channel || tab.user, tab.user));
} else if (servers.has(server)) {
dispatch(select(server));
} else {
dispatch(routeActions.replace('/'));
dispatch(replace('/'));
}
};
}