Skip to content

Commit 10aae90

Browse files
committed
clean code
1 parent ea8e315 commit 10aae90

15 files changed

Lines changed: 84 additions & 625 deletions

File tree

browser/lib/modal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class ModalBase extends React.Component {
2222
render () {
2323
return (
2424
<div className={'ModalBase' + (this.state.isHidden ? ' hide' : '')}>
25-
<div onClick={e => this.close(e)} className='modalBack'/>
25+
<div onClick={(e) => this.close(e)} className='modalBack'/>
2626
{this.state.component == null ? null : (
2727
<this.state.component {...this.state.componentProps} close={this.close}/>
2828
)}

browser/main/HomePage/ArticleDetail/index.js

Lines changed: 22 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ import React, { PropTypes } from 'react'
22
import ReactDOM from 'react-dom'
33
import moment from 'moment'
44
import _ from 'lodash'
5-
import {
6-
switchFolder,
7-
updateArticle
8-
} from '../../actions'
95
import linkState from 'browser/lib/linkState'
106
import TagSelect from 'browser/components/TagSelect'
117
import ModeSelect from 'browser/components/ModeSelect'
@@ -67,25 +63,25 @@ export default class ArticleDetail extends React.Component {
6763
constructor (props) {
6864
super(props)
6965

70-
this.deleteHandler = e => {
66+
this.deleteHandler = (e) => {
7167
if (isModalOpen()) return true
7268
this.handleDeleteButtonClick()
7369
}
74-
this.uncacheHandler = e => {
70+
this.uncacheHandler = (e) => {
7571
if (isModalOpen()) return true
7672
this.handleUncache()
7773
}
78-
this.titleHandler = e => {
74+
this.titleHandler = (e) => {
7975
if (isModalOpen()) return true
8076
if (this.refs.title) {
8177
this.focusTitle()
8278
}
8379
}
84-
this.editHandler = e => {
80+
this.editHandler = (e) => {
8581
if (isModalOpen()) return true
8682
if (this.refs.editor) this.refs.editor.switchEditMode()
8783
}
88-
this.previewHandler = e => {
84+
this.previewHandler = (e) => {
8985
if (isModalOpen()) return true
9086
if (this.refs.editor) this.refs.editor.switchPreviewMode()
9187
}
@@ -100,7 +96,7 @@ export default class ArticleDetail extends React.Component {
10096

10197
componentDidMount () {
10298
this.refreshTimer = setInterval(() => this.forceUpdate(), 60 * 1000)
103-
this.shareDropdownInterceptor = e => {
99+
this.shareDropdownInterceptor = (e) => {
104100
e.stopPropagation()
105101
}
106102

@@ -159,12 +155,12 @@ export default class ArticleDetail extends React.Component {
159155
updatedAt: new Date()
160156
})
161157

162-
dispatch(updateArticle(article))
158+
// dispatch(updateArticle(article))
163159

164160
let targetFolderKey = e.target.value
165161
if (status.targetFolders.length > 0) {
166162
let targetFolder = _.findWhere(folders, {key: targetFolderKey})
167-
dispatch(switchFolder(targetFolder.name))
163+
// dispatch(switchFolder(targetFolder.name))
168164
}
169165
}
170166

@@ -174,7 +170,7 @@ export default class ArticleDetail extends React.Component {
174170
title: e.target.value,
175171
updatedAt: new Date()
176172
})
177-
dispatch(updateArticle(article))
173+
// dispatch(updateArticle(article))
178174
}
179175

180176
handleTagsChange (newTag, tags) {
@@ -184,7 +180,7 @@ export default class ArticleDetail extends React.Component {
184180
updatedAt: new Date()
185181
})
186182

187-
dispatch(updateArticle(article))
183+
// dispatch(updateArticle(article))
188184
}
189185

190186
handleModeChange (value) {
@@ -194,7 +190,7 @@ export default class ArticleDetail extends React.Component {
194190
updatedAt: new Date()
195191
})
196192

197-
dispatch(updateArticle(article))
193+
// dispatch(updateArticle(article))
198194
this.switchEditMode()
199195
}
200196

@@ -206,7 +202,7 @@ export default class ArticleDetail extends React.Component {
206202
updatedAt: new Date()
207203
})
208204

209-
dispatch(updateArticle(article))
205+
// dispatch(updateArticle(article))
210206
}
211207
}
212208

@@ -254,7 +250,7 @@ export default class ArticleDetail extends React.Component {
254250
render () {
255251
let { folders, status, tags, activeArticle, modified, user } = this.props
256252
if (activeArticle == null) return this.renderEmpty()
257-
let folderOptions = folders.map(folder => {
253+
let folderOptions = folders.map((folder) => {
258254
return (
259255
<option key={folder.key} value={folder.key}>{folder.name}</option>
260256
)
@@ -269,7 +265,7 @@ export default class ArticleDetail extends React.Component {
269265
<select
270266
className='ArticleDetail-info-folder'
271267
value={activeArticle.FolderKey}
272-
onChange={e => this.handleFolderKeyChange(e)}
268+
onChange={(e) => this.handleFolderKeyChange(e)}
273269
>
274270
{folderOptions}
275271
</select>
@@ -282,25 +278,14 @@ export default class ArticleDetail extends React.Component {
282278
/>
283279

284280
<div className='ArticleDetail-info-control'>
285-
{/*<div className={'ArticleDetail-info-control-save' + (!isUnsaved ? ' hide' : '')}>
286-
<button
287-
onClick={e => this.handleSaveButtonClick(e)}
288-
className='ArticleDetail-info-control-save-button'
289-
disabled={!isUnsaved}
290-
>
291-
<i className='fa fa-fw fa-save'/>&nbsp;Save
292-
<span className='tooltip' children={`Save Post (${OSX ? '⌘' : '^'} + S)`}/>
293-
</button>
294-
</div>*/}
295-
296281
<ShareButton
297282
article={activeArticle}
298283
user={user}
299284
/>
300285

301-
<button className='ArticleDetail-info-control-delete-button' onClick={e => this.handleOthersButtonClick(e)}>
286+
<button className='ArticleDetail-info-control-delete-button' onClick={(e) => this.handleOthersButtonClick(e)}>
302287
<i className='fa fa-fw fa-trash'/>
303-
<span className='tooltip' children={`Delete Post (^ + Del)`}/>
288+
<span className='tooltip'>Delete Post (^ + Del)</span>
304289
</button>
305290
</div>
306291
</div>
@@ -319,20 +304,20 @@ export default class ArticleDetail extends React.Component {
319304
<div className='ArticleDetail-panel-header'>
320305
<div className='ArticleDetail-panel-header-title'>
321306
<input
322-
onKeyDown={e => this.handleTitleKeyDown(e)}
307+
onKeyDown={(e) => this.handleTitleKeyDown(e)}
323308
placeholder='(Untitled)'
324309
ref='title'
325310
value={activeArticle.title}
326-
onChange={e => this.handleTitleChange(e)}
311+
onChange={(e) => this.handleTitleChange(e)}
327312
style={{
328313
fontFamily: this.state.fontFamily
329314
}}
330315
/>
331316
</div>
332317
<ModeSelect
333318
ref='mode'
334-
onChange={e => this.handleModeChange(e)}
335-
onKeyDown={e => this.handleModeSelectKeyDown(e)}
319+
onChange={(e) => this.handleModeChange(e)}
320+
onKeyDown={(e) => this.handleModeSelectKeyDown(e)}
336321
value={activeArticle.mode}
337322
className='ArticleDetail-panel-header-mode'
338323
/>
@@ -341,7 +326,7 @@ export default class ArticleDetail extends React.Component {
341326
<ArticleEditor
342327
ref='editor'
343328
article={activeArticle}
344-
onChange={content => this.handleContentChange(content)}
329+
onChange={(content) => this.handleContentChange(content)}
345330
/>
346331
</div>
347332
</div>
@@ -351,11 +336,6 @@ export default class ArticleDetail extends React.Component {
351336

352337
ArticleDetail.propTypes = {
353338
dispatch: PropTypes.func,
354-
status: PropTypes.shape(),
355-
tags: PropTypes.array,
356-
user: PropTypes.shape(),
357-
folders: PropTypes.array,
358-
modified: PropTypes.array,
359-
activeArticle: PropTypes.shape()
339+
repositories: PropTypes.array
360340
}
361341
ArticleDetail.prototype.linkState = linkState

browser/main/HomePage/ArticleList.js

Lines changed: 17 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import React, { PropTypes } from 'react'
22
import ReactDOM from 'react-dom'
33
import ModeIcon from 'browser/components/ModeIcon'
44
import moment from 'moment'
5-
import { switchArticle } from '../actions'
65
import FolderMark from 'browser/components/FolderMark'
76
import TagLink from './TagLink'
87
import _ from 'lodash'
@@ -15,7 +14,7 @@ export default class ArticleList extends React.Component {
1514
constructor (props) {
1615
super(props)
1716

18-
this.focusHandler = e => this.focus()
17+
this.focusHandler = (e) => this.focus()
1918
}
2019

2120
componentDidMount () {
@@ -30,8 +29,8 @@ export default class ArticleList extends React.Component {
3029
}
3130

3231
componentDidUpdate () {
33-
let { articles, activeArticle } = this.props
34-
var index = articles.indexOf(activeArticle)
32+
return false
33+
var index = articles.indexOf(null)
3534
var el = ReactDOM.findDOMNode(this)
3635
var li = el.querySelectorAll('.ArticleList>div')[index]
3736

@@ -130,16 +129,12 @@ export default class ArticleList extends React.Component {
130129
}
131130

132131
render () {
133-
let { articles, modified, activeArticle, folders } = this.props
134-
135-
let articleElements = articles.map(article => {
136-
let modifiedArticle = _.findWhere(modified, {key: article.key})
132+
let articles = []
133+
let folders = []
134+
let articleElements = articles.map((article) => {
137135
let originalArticle = article
138-
if (modifiedArticle) {
139-
article = Object.assign({}, article)
140-
}
141136
let tagElements = Array.isArray(article.tags) && article.tags.length > 0
142-
? article.tags.slice().map(tag => {
137+
? article.tags.slice().map((tag) => {
143138
return (<TagLink key={tag} tag={tag}/>)
144139
})
145140
: (<span>Not tagged yet</span>)
@@ -153,27 +148,21 @@ export default class ArticleList extends React.Component {
153148

154149
return (
155150
<div key={'article-' + article.key}>
156-
<div onClick={e => this.handleArticleClick(article)(e)} className={'ArticleList-item' + (activeArticle.key === article.key ? ' active' : '')}>
151+
<div onClick={(e) => this.handleArticleClick(article)(e)} className={'ArticleList-item' + (article.key === 'ACTIVE_POST_KEY' ? ' active' : '')}>
157152
<div className='ArticleList-item-top'>
158153
{folder != null
159154
? folderChanged
160155
? <span className='folderName'>
161-
<FolderMark color={originalFolder.color}/>{originalFolder.name}
162-
->
163-
<FolderMark color={folder.color}/>{folder.name}
164-
</span>
156+
<FolderMark color={originalFolder.color}/>{originalFolder.name}
157+
->
158+
<FolderMark color={folder.color}/>{folder.name}
159+
</span>
165160
: <span className='folderName'>
166-
<FolderMark color={folder.color}/>{folder.name}
167-
</span>
161+
<FolderMark color={folder.color}/>{folder.name}
162+
</span>
168163
: <span><FolderMark color={-1}/>Unknown</span>
169164
}
170-
<span className='updatedAt'
171-
children={
172-
modifiedArticle != null
173-
? <span><span className='unsaved-mark'></span> Unsaved</span>
174-
: moment(article.updatedAt).fromNow()
175-
}
176-
/>
165+
<span className='updatedAt'>{moment(article.updatedAt).fromNow()}</span>
177166
</div>
178167
<div className='ArticleList-item-middle'>
179168
<ModeIcon className='mode' mode={article.mode}/> <div className='title' children={title}/>
@@ -191,7 +180,7 @@ export default class ArticleList extends React.Component {
191180
})
192181

193182
return (
194-
<div tabIndex='3' onKeyDown={e => this.handleArticleListKeyDown(e)} className='ArticleList'>
183+
<div tabIndex='3' onKeyDown={(e) => this.handleArticleListKeyDown(e)} className='ArticleList'>
195184
{articleElements}
196185
</div>
197186
)
@@ -200,8 +189,5 @@ export default class ArticleList extends React.Component {
200189

201190
ArticleList.propTypes = {
202191
dispatch: PropTypes.func,
203-
folders: PropTypes.array,
204-
articles: PropTypes.array,
205-
modified: PropTypes.array,
206-
activeArticle: PropTypes.shape()
192+
repositories: PropTypes.array
207193
}

0 commit comments

Comments
 (0)