Skip to content

Commit ff2ba0f

Browse files
author
soliury
committed
refactor
1 parent 5676855 commit ff2ba0f

21 files changed

Lines changed: 56 additions & 66 deletions

‎app/components/comment/commentListView.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var Storage = require('../../util/storage');
1919
var topicService = require('../../services/topicService');
2020

2121
var genColor = require('../../util/genColor');
22-
var config = require('../../config');
22+
var config = require('../../config/config');
2323
var animations = require('../../util/animation');
2424
var sceneConfig = require('../../config/sceneConfig')
2525
var routes = require('../../config/routes')
@@ -211,4 +211,4 @@ class CommentListView extends Component {
211211
}
212212

213213

214-
module.exports = CommentListView
214+
module.exports = CommentListView

‎app/components/login.js‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
var React = require('react-native');
2-
var Modal = require('react-native-modal');
3-
var Button = require('react-native-button');
4-
var Icon = require('FAKIconImage');
5-
var Camera = require('react-native-camera');
1+
var React = require('react-native')
2+
var Modal = require('react-native-modal')
3+
var Button = require('react-native-button')
4+
var Icon = require('FAKIconImage')
5+
var Camera = require('react-native-camera')
66

77

8-
var Storage = require('../util/storage');
9-
var userService = require('../services/userService');
8+
var Storage = require('../util/storage')
9+
var userService = require('../services/userService')
1010

11-
var config = require('../config');
11+
var config = require('../config/config')
1212
var routes = require('../config/routes')
1313

14-
var window = require('../util/window');
14+
var window = require('../util/window')
1515
var { width, height } = window.get()
1616

1717
var {
@@ -170,9 +170,6 @@ class Login extends Component {
170170
return userService.req.getLoginUserInfo(user)
171171
})
172172
.then((userInfo)=> {
173-
//console.log('ok');
174-
//console.log(userInfo);
175-
176173
if (userInfo) {
177174
this.setState({
178175
isModalOpen: false

‎app/components/messageListView.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var React = require('react-native')
22
var moment = require('moment')
33

44

5-
var config = require('../config')
5+
var config = require('../config/config')
66
var routes = require('../config/routes')
77
var window = require('../util/window')
88
var { width, height } = window.get()

‎app/components/overlay/commentOverlay.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ var Button = require('react-native-button');
77
var OverlayButton = require('./overlayButton');
88

99

10-
var config = require('../../config');
10+
var config = require('../../config/config');
1111

1212
var { width, height } = Dimensions.get('window');
1313

@@ -92,4 +92,4 @@ class CommentOverlay extends Component {
9292
}
9393

9494

95-
module.exports = CommentOverlay
95+
module.exports = CommentOverlay

‎app/components/overlay/markAsReadOverlay.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var OverlayButton = require('./overlayButton');
55
var window = require('../../util/window');
66
var { width, height } = window.get()
77

8-
var config = require('../../config');
8+
var config = require('../../config/config');
99

1010

1111
var {

‎app/components/overlay/messageOverlay.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var OverlayButton = require('./overlayButton')
66
var Storage = require('../../util/storage')
77

88

9-
var config = require('../../config')
9+
var config = require('../../config/config')
1010
var routes = require('../../config/routes')
1111
var messageService = require('../../services/messageService')
1212

@@ -146,4 +146,4 @@ var styles = StyleSheet.create({
146146
})
147147

148148

149-
module.exports = MessageOverlay
149+
module.exports = MessageOverlay

‎app/components/overlay/userOverlay.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var Icon = require('FAKIconImage')
33

44
var OverlayButton = require('./overlayButton')
55

6-
var config = require('../../config')
6+
var config = require('../../config/config')
77

88
var window = require('../../util/window')
99
var { width, height } = window.get()
@@ -68,4 +68,4 @@ class UserOverlay extends Component {
6868
}
6969
}
7070

71-
module.exports = UserOverlay
71+
module.exports = UserOverlay

‎app/components/pageListView.js‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
var React = require('react-native');
22
var moment = require('moment');
33

4-
var Storage = require('../util/storage');
54
var topicService = require('../services/topicService')
65
var TopicRow = require('../components/topicRow')
76

87
var routes = require('../config/routes')
9-
var config = require('../config');
8+
var config = require('../config/config')
109
var sceneConfig = require('../config/sceneConfig')
11-
var styles = require('../styles/pageListView');
12-
var window = require('../util/window');
10+
var styles = require('../styles/pageListView')
11+
var window = require('../util/window')
1312
var { width, height } = window.get()
1413

1514
var {
@@ -258,13 +257,11 @@ class PageListView extends Component {
258257
dataSource={this.state.ds}
259258
renderRow={this.renderRow.bind(this)}
260259
onEndReached={this.onEndReached.bind(this)}
261-
onEndReachedThreshold={16}
262-
//scrollRenderAheadDistance={30}
263260
/>
264261
{this._renderLoading('bottom')}
265262
</View>
266263
)
267264
}
268265
}
269266

270-
module.exports = PageListView;
267+
module.exports = PageListView;

‎app/components/topicRow.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ var React = require('react-native')
22
var moment = require('moment')
33

44

5-
var config = require('../config')
5+
var config = require('../config/config')
66

77
var window = require('../util/window')
88
var { width, height } = window.get()
@@ -103,4 +103,4 @@ var styles = StyleSheet.create({
103103
})
104104

105105

106-
module.exports = TopicRow
106+
module.exports = TopicRow

‎app/components/topicsInTab.js‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
var React = require('react-native');
2-
var rebound = require('rebound');
1+
var React = require('react-native')
2+
var rebound = require('rebound')
33

44
// custom component
5-
var PageScrollView = require('./pageScrollView');
6-
var PageNavBar = require('./pageNavBar');
7-
var PageListView = require('./pageListView');
5+
var PageScrollView = require('./pageScrollView')
6+
var PageNavBar = require('./pageNavBar')
7+
var PageListView = require('./pageListView')
88

99

10-
var window = require('../util/window');
10+
var window = require('../util/window')
1111
var { width, height } = window.get()
1212

1313
var {
@@ -84,9 +84,6 @@ class TopicsInTab extends Component {
8484

8585
//don't render when the pageIndex is not change
8686
shouldComponentUpdate(nextProps, nextState) {
87-
//if (nextState.pageIndex == this.state.pageIndex) {
88-
// return true;
89-
//}
9087
return false;
9188
}
9289

@@ -113,7 +110,6 @@ class TopicsInTab extends Component {
113110
pageIndex={index}
114111
navs={navs}
115112
space={space}
116-
//currentPageIndex={self.state.pageIndex}
117113
/>
118114
)
119115
});
@@ -147,4 +143,4 @@ class TopicsInTab extends Component {
147143
}
148144

149145

150-
module.exports = TopicsInTab
146+
module.exports = TopicsInTab

0 commit comments

Comments
 (0)