Skip to content

Commit 5921e4a

Browse files
committed
some code style
1 parent 2400a2c commit 5921e4a

9 files changed

+39
-74
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
/node_modules/
55
/assets.json
66
/index.html
7+
/tasks/assets.json

src/actions.coffee

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
'use strict'
1+
22
recorder = require('actions-recorder')
33
dispatch = recorder.dispatch
44

src/configs.coffee

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
'use strict'
1+
22
module.exports = domain: 'https://cnodejs.org'

src/controller.coffee

+10-32
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,35 @@
1-
'use strict'
1+
22
recorder = require('actions-recorder')
33
Immutable = require('immutable')
44
ajax = require('./ajax')
55
actions = require('./actions')
66

77
exports.start = ->
88
store = recorder.getStore()
9-
page = store.getIn([
10-
'device'
11-
'page'
12-
])
9+
page = store.getIn(['device', 'page'])
1310
actions.deviceLoading 'start'
1411
ajax.topicGetList page + 1, (topicList) ->
1512
actions.topicGetList topicList
1613
actions.deviceLoaded()
1714
maybeToken = localStorage.getItem('cnodejs-reader-token')
18-
if maybeToken != null
15+
if maybeToken?
1916
exports.userAccesstoken maybeToken, (loginname) ->
2017
exports.loopRequestMessages maybeToken
21-
undefined
2218

2319
exports.routerTopic = (id) ->
2420
store = recorder.getStore()
25-
if store.hasIn([
26-
'topicDetails'
27-
id
28-
])
21+
if store.hasIn(['topicDetails', id])
2922
actions.routerTopic id
3023
else
3124
actions.deviceLoading 'topic'
3225
ajax.topicGet id, (topic) ->
3326
actions.topicGet topic
3427
actions.routerTopic id
3528
actions.deviceLoaded()
36-
undefined
3729

3830
exports.routerUser = (loginname) ->
3931
store = recorder.getStore()
40-
if store.hasIn([
41-
'users'
42-
loginname
43-
])
32+
if store.hasIn(['users', loginname])
4433
actions.routerUser loginname
4534
else
4635
actions.deviceLoading 'user'
@@ -78,10 +67,7 @@ exports.replyCreate = (data) ->
7867

7968
exports.topicMore = ->
8069
store = recorder.getStore()
81-
page = store.getIn([
82-
'device'
83-
'page'
84-
])
70+
page = store.getIn(['device', 'page'])
8571
ajax.topicGetList page + 1, (topicList) ->
8672
actions.topicGetList topicList
8773

@@ -95,35 +81,27 @@ exports.routerGo = (info) ->
9581
when 'home'
9682
actions.routerHome()
9783
when 'topic'
98-
exports.routerTopic info.getIn([
99-
'data'
100-
'id'
101-
])
84+
exports.routerTopic info.getIn(['data', 'id'])
10285
when 'user'
103-
exports.routerUser info.getIn([
104-
'data'
105-
'loginname'
106-
])
86+
exports.routerUser info.getIn(['data', 'loginname'])
10787
when 'post'
10888
actions.routerPost()
10989
else
11090
actions.routerHome()
11191
break
112-
undefined
11392

11493
exports.loopRequestMessages = (token) ->
11594
exports.messageGetList token
116-
setInterval (->
95+
setInterval ->
11796
exports.messageGetList token
118-
), 20000
97+
, 20000
11998

12099
exports.messageGetList = (token) ->
121100
store = recorder.getStore()
122101
currentMessages = store.get('messages')
123102
ajax.messageGetList token, (messages) ->
124103
if !Immutable.is(Immutable.fromJS(messages), currentMessages)
125104
actions.messageGetList messages
126-
undefined
127105

128106
exports.messageMarkAll = ->
129107
token = localStorage.getItem('cnodejs-reader-token')

src/main.coffee

+13-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
'use strict'
1+
22
React = require('react')
33
ReactDOM = require('react-dom')
44
recorder = require('actions-recorder')
55
pathUtil = require('router-view/lib/path')
6+
67
require '../style/main.css'
8+
79
routes = require('./routes')
810
schema = require('./schema')
911
updater = require('./updater')
1012
controller = require('./controller')
13+
1114
Page = React.createFactory(require('./app/page'))
15+
1216
oldAddress = location.hash.substr(1)
1317
router = pathUtil.getCurrentInfo(routes, oldAddress)
18+
1419
recorder.setup
1520
initial: schema.store
1621
updater: updater
@@ -20,25 +25,22 @@ render = (core) ->
2025

2126
recorder.request render
2227
recorder.subscribe render
28+
2329
if module.hot
24-
module.hot.accept [
25-
'./schema'
26-
'./updater'
27-
], ->
28-
`var schema`
29-
`var updater`
30+
module.hot.accept ['./schema', './updater'], ->
3031
schema = require('./schema')
3132
updater = require('./updater')
3233
recorder.hotSetup
3334
initial: schema.store
3435
updater: updater
36+
3537
module.hot.accept './controller', ->
38+
3639
module.hot.accept './app/page', ->
3740
Page = React.createFactory(require('./app/page'))
3841
recorder.request render
42+
3943
controller.start()
44+
4045
if router.get('name') == 'topic'
41-
controller.routerTopic router.getIn([
42-
'data'
43-
'id'
44-
])
46+
controller.routerTopic router.getIn ['data', 'id']

src/routes.coffee

+9-23
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,10 @@
1-
'use strict'
1+
22
pathUtil = require('router-view/lib/path')
3-
module.exports = pathUtil.expandRoutes([
4-
[
5-
'home'
6-
'/'
7-
]
8-
[
9-
'post'
10-
'/topic/post'
11-
]
12-
[
13-
'topic'
14-
'/topic/:id'
15-
]
16-
[
17-
'user'
18-
'/user/:loginname'
19-
]
20-
[
21-
'message'
22-
'/message'
23-
]
24-
])
3+
4+
module.exports = pathUtil.expandRoutes [
5+
['home', '/' ]
6+
['post', '/topic/post' ]
7+
['topic', '/topic/:id' ]
8+
['user', '/user/:loginname' ]
9+
['message', '/message' ]
10+
]

src/schema.coffee

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
'use strict'
1+
22
Immutable = require('immutable')
3-
exports.store = Immutable.fromJS(
3+
4+
exports.store = Immutable.fromJS
45
router:
56
name: 'home'
67
data: {}
@@ -16,4 +17,4 @@ exports.store = Immutable.fromJS(
1617
loadingKind: null
1718
loginname: null
1819
page: 0
19-
isTopicEnd: false)
20+
isTopicEnd: false

src/server.coffee

-2
This file was deleted.

tasks/assets.json

-1
This file was deleted.

0 commit comments

Comments
 (0)