Merge pull request #11 from Coding/master

Merge master branch from Coding

Author: 春秋一语

app/commands/commandBindings/file.js

@@ -3,8 +3,8 @@ import { path as pathUtil } from '../../utils'
 import api from '../../backendAPI'
 import * as Modal from '../../components/Modal/actions'
 import TabStore from 'components/Tab/store'
-import FileState from 'commons/File/state'
 import FileStore from 'commons/File/store'
+const FileState = FileStore.getState()
 import { notify } from '../../components/Notification/actions'
 import i18n from 'utils/createI18n'
 import icons from 'file-icons-js'

package.json

@@ -124,7 +124,7 @@
     "reselect": "^2.5.4",
     "sh.js": "git+https://github.com/vangie/sh.js#v1.2.28",
     "socket.io-client": "^1.7.3",
-    "socket.io-client-legacy": "git+https://github.com/hackape/socket.io-client#0.9.18",
+    "socket.io-client-legacy": "git+https://github.com/Coding/socket.io-client#0.9.18",
     "sockjs-client": "^1.1.1",
     "stompjs": "^2.3.3",
     "styled-components": "^2.1.2",