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/reducers/index.js
View file

@ -1,5 +1,5 @@
import { combineReducers } from 'redux';
import { routeReducer } from 'react-router-redux';
import { routerReducer } from 'react-router-redux';
import channels from './channels';
import environment from './environment';
import input from './input';
@ -12,7 +12,7 @@ import tab from './tab';
import ui from './ui';
export default combineReducers({
routing: routeReducer,
routing: routerReducer,
channels,
environment,
input,

4
client/src/js/reducers/tab.js
View file

@ -1,5 +1,5 @@
import { Record, List } from 'immutable';
import { UPDATE_LOCATION } from 'react-router-redux';
import { LOCATION_CHANGE } from 'react-router-redux';
import createReducer from '../util/createReducer';
import * as actions from '../actions';
@ -38,7 +38,7 @@ export default createReducer(new State(), {
return state.set('history', state.history.filter(tab => tab.server !== action.server));
},
[UPDATE_LOCATION](state, action) {
[LOCATION_CHANGE](state, action) {
if (action.payload.pathname.indexOf('.') === -1 && state.selected.server) {
return state.set('selected', new Tab());
}