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-04-18 01:11:25 +02:00
parent 8b6236446f
commit 493f49a508
4 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
assets/bindata.go
View File

File diff suppressed because one or more lines are too long

3
client/.eslintrc
View File

@ -7,7 +7,8 @@
"no-console": 0, "no-console": 0,
"no-param-reassign": 0, "no-param-reassign": 0,
"react/prop-types": 0, "react/prop-types": 0,
"react/prefer-stateless-function": 0 "react/prefer-stateless-function": 0,
"react/require-render-return": 0
}, },
"globals": { "globals": {
"__DEV__": true "__DEV__": true

41
client/package.json
View File

@ -4,8 +4,8 @@
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"devDependencies": { "devDependencies": {
"babel-core": "^6.7.2", "babel-core": "^6.7.6",
"babel-eslint": "^6.0.0-beta.6", "babel-eslint": "^6.0.2",
"babel-loader": "^6.2.4", "babel-loader": "^6.2.4",
"babel-plugin-react-transform": "^2.0.2", "babel-plugin-react-transform": "^2.0.2",
"babel-plugin-transform-decorators-legacy": "^1.3.4", "babel-plugin-transform-decorators-legacy": "^1.3.4",
@ -15,10 +15,11 @@
"babel-preset-react": "^6.5.0", "babel-preset-react": "^6.5.0",
"babel-preset-stage-0": "^6.5.0", "babel-preset-stage-0": "^6.5.0",
"css-loader": "^0.23.1", "css-loader": "^0.23.1",
"eslint": "^2.4.0", "eslint": "^2.8.0",
"eslint-config-airbnb": "^6.1.0", "eslint-config-airbnb": "^7.0.0",
"eslint-loader": "^1.3.0", "eslint-loader": "^1.3.0",
"eslint-plugin-react": "^4.2.1", "eslint-plugin-jsx-a11y": "^0.6.2",
"eslint-plugin-react": "^5.0.0",
"express": "^4.13.4", "express": "^4.13.4",
"express-http-proxy": "^0.6.0", "express-http-proxy": "^0.6.0",
"gulp": "^3.9.1", "gulp": "^3.9.1",
@ -31,10 +32,10 @@
"ify-loader": "^1.0.3", "ify-loader": "^1.0.3",
"react-transform-catch-errors": "^1.0.2", "react-transform-catch-errors": "^1.0.2",
"react-transform-hmr": "^1.0.4", "react-transform-hmr": "^1.0.4",
"redbox-react": "^1.2.2", "redbox-react": "^1.2.3",
"style-loader": "^0.13.0", "style-loader": "^0.13.1",
"webpack": "^1.12.14", "webpack": "^1.13.0",
"webpack-dev-middleware": "^1.5.1", "webpack-dev-middleware": "^1.6.1",
"webpack-hot-middleware": "^2.10.0" "webpack-hot-middleware": "^2.10.0"
}, },
"dependencies": { "dependencies": {
@ -42,18 +43,18 @@
"backo": "^1.1.0", "backo": "^1.1.0",
"base64-arraybuffer": "^0.1.5", "base64-arraybuffer": "^0.1.5",
"eventemitter2": "^1.0.0", "eventemitter2": "^1.0.0",
"history": "^2.0.1", "history": "^2.0.2",
"immutable": "^3.7.6", "immutable": "^3.8.0",
"lodash": "^4.6.1", "lodash": "^4.11.1",
"pure-render-decorator": "^0.2.0", "pure-render-decorator": "^1.1.0",
"react": "^15.0.0-rc.1", "react": "^15.0.1",
"react-dom": "^15.0.0-rc.1", "react-dom": "^15.0.1",
"react-redux": "^4.4.1", "react-redux": "^4.4.5",
"react-router": "^2.0.1", "react-router": "^2.2.4",
"react-router-redux": "^4.0.0", "react-router-redux": "^4.0.2",
"react-virtualized": "^4.10.0", "react-virtualized": "^4.10.0",
"redux": "^3.3.1", "redux": "^3.4.0",
"redux-thunk": "^2.0.1", "redux-thunk": "^2.0.1",
"reselect": "^2.1.0" "reselect": "^2.4.0"
} }
} }

9
client/src/js/containers/Chat.js
View File

@ -126,8 +126,13 @@ const serverSelector = state => state.servers;
const channelSelector = state => state.channels; const channelSelector = state => state.channels;
const searchSelector = state => state.search; const searchSelector = state => state.search;
const showUserListSelector = state => state.ui.showUserList; const showUserListSelector = state => state.ui.showUserList;
const historySelector = state => const historySelector = state => {
state.input.index === -1 ? null : state.input.history.get(state.input.index); if (state.input.index === -1) {
return null;
}
return state.input.history.get(state.input.index);
};
const selectedMessagesSelector = createSelector( const selectedMessagesSelector = createSelector(
tabSelector, tabSelector,