1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-23 22:51:42 +00:00

clean code

This commit is contained in:
Rokt33r
2016-05-03 15:41:11 +09:00
parent ea8e31561e
commit 10aae90ae2
15 changed files with 84 additions and 625 deletions

View File

@@ -1,7 +1,6 @@
import React, { PropTypes } from 'react'
import ReactDOM from 'react-dom'
import linkState from 'browser/lib/linkState'
import { createFolder } from '../actions'
import store from '../store'
import FolderMark from 'browser/components/FolderMark'
@@ -34,7 +33,7 @@ export default class CreateNewFolder extends React.Component {
color
}
try {
store.dispatch(createFolder(input))
// store.dispatch(createFolder(input))
} catch (e) {
this.setState({alert: {
type: 'error',
@@ -47,7 +46,7 @@ export default class CreateNewFolder extends React.Component {
}
handleColorClick (colorIndex) {
return e => {
return (e) => {
this.setState({
color: colorIndex
})
@@ -63,20 +62,20 @@ export default class CreateNewFolder extends React.Component {
render () {
let alert = this.state.alert
let alertElement = alert != null ? (
<p className={`alert ${alert.type}`}>
{alert.message}
</p>
) : null
<p className={`alert ${alert.type}`}>
{alert.message}
</p>
) : null
let colorIndexes = []
for (let i = 0; i < 8; i++) {
colorIndexes.push(i)
}
let colorElements = colorIndexes.map(index => {
let colorElements = colorIndexes.map((index) => {
let className = 'option'
if (index === this.state.color) className += ' active'
return (
<span className={className} key={index} onClick={e => this.handleColorClick(index)(e)}>
<span className={className} key={index} onClick={(e) => this.handleColorClick(index)(e)}>
<FolderMark color={index}/>
</span>
)
@@ -84,17 +83,17 @@ export default class CreateNewFolder extends React.Component {
return (
<div className='CreateNewFolder modal'>
<button onClick={e => this.handleCloseButton(e)} className='closeBtn'><i className='fa fa-fw fa-times'/></button>
<button onClick={(e) => this.handleCloseButton(e)} className='closeBtn'><i className='fa fa-fw fa-times'/></button>
<div className='title'>Create new folder</div>
<input ref='folderName' onKeyDown={e => this.handleKeyDown(e)} className='ipt' type='text' valueLink={this.linkState('name')} placeholder='Enter folder name'/>
<input ref='folderName' onKeyDown={(e) => this.handleKeyDown(e)} className='ipt' type='text' valueLink={this.linkState('name')} placeholder='Enter folder name'/>
<div className='colorSelect'>
{colorElements}
</div>
{alertElement}
<button onClick={e => this.handleConfirmButton(e)} className='confirmBtn'>Create</button>
<button onClick={(e) => this.handleConfirmButton(e)} className='confirmBtn'>Create</button>
</div>
)
}

View File

@@ -1,7 +1,6 @@
import React, { PropTypes } from 'react'
import ReactDOM from 'react-dom'
import store from '../store'
import { destroyArticle } from '../actions'
const electron = require('electron')
const ipc = electron.ipcRenderer
@@ -10,7 +9,7 @@ export default class DeleteArticleModal extends React.Component {
constructor (props) {
super(props)
this.confirmHandler = e => this.handleYesButtonClick()
this.confirmHandler = (e) => this.handleYesButtonClick()
}
componentDidMount () {
@@ -27,7 +26,7 @@ export default class DeleteArticleModal extends React.Component {
}
handleYesButtonClick (e) {
store.dispatch(destroyArticle(this.props.articleKey))
// store.dispatch(destroyArticle(this.props.articleKey))
this.props.close()
}
@@ -39,8 +38,8 @@ export default class DeleteArticleModal extends React.Component {
<div className='message'>Do you really want to delete?</div>
<div className='control'>
<button ref='no' onClick={e => this.handleNoButtonClick(e)}><i className='fa fa-fw fa-close'/> No</button>
<button ref='yes' onClick={e => this.handleYesButtonClick(e)} className='danger'><i className='fa fa-fw fa-check'/> Yes</button>
<button ref='no' onClick={(e) => this.handleNoButtonClick(e)}><i className='fa fa-fw fa-close'/> No</button>
<button ref='yes' onClick={(e) => this.handleYesButtonClick(e)} className='danger'><i className='fa fa-fw fa-check'/> Yes</button>
</div>
</div>
)

View File

@@ -1,6 +1,5 @@
import React, { PropTypes } from 'react'
import linkState from 'browser/lib/linkState'
import { updateUser } from '../../actions'
import fetchConfig from 'browser/lib/fetchConfig'
import hljsTheme from 'browser/lib/hljsThemes'
@@ -38,7 +37,7 @@ export default class AppSettingTab extends React.Component {
message: 'Successfully done!'
}})
}
this.handleSettingError = err => {
this.handleSettingError = (err) => {
this.setState({keymapAlert: {
type: 'error',
message: err.message != null ? err.message : 'Error occurs!'

View File

@@ -2,7 +2,6 @@ import React, { PropTypes } from 'react'
import linkState from 'browser/lib/linkState'
import FolderMark from 'browser/components/FolderMark'
import store from '../../store'
import { updateFolder, destroyFolder, replaceFolder } from '../../actions'
const IDLE = 'IDLE'
const EDIT = 'EDIT'
@@ -20,14 +19,14 @@ export default class FolderRow extends React.Component {
handleUpClick (e) {
let { index } = this.props
if (index > 0) {
store.dispatch(replaceFolder(index, index - 1))
// store.dispatch(replaceFolder(index, index - 1))
}
}
handleDownClick (e) {
let { index, count } = this.props
if (index < count - 1) {
store.dispatch(replaceFolder(index, index + 1))
// store.dispatch(replaceFolder(index, index + 1))
}
}
@@ -82,7 +81,7 @@ export default class FolderRow extends React.Component {
folder = Object.assign({}, folder, input)
try {
store.dispatch(updateFolder(folder))
// store.dispatch(updateFolder(folder))
this.setState({
mode: IDLE
})
@@ -98,7 +97,7 @@ export default class FolderRow extends React.Component {
handleDeleteConfirmButtonClick (e) {
let { folder } = this.props
store.dispatch(destroyFolder(folder.key))
// store.dispatch(destroyFolder(folder.key))
}
render () {
@@ -111,7 +110,7 @@ export default class FolderRow extends React.Component {
colorIndexes.push(i)
}
let colorOptions = colorIndexes.map(index => {
let colorOptions = colorIndexes.map((index) => {
let className = this.state.color === index
? 'active'
: null
@@ -129,12 +128,10 @@ export default class FolderRow extends React.Component {
<FolderMark color={this.state.color}/>
</button>
{this.state.isColorEditing
? (
<div className='options'>
<div className='label'>Color select</div>
{colorOptions}
</div>
)
? <div className='options'>
<div className='label'>Color select</div>
{colorOptions}
</div>
: null
}
</div>

View File

@@ -1,7 +1,6 @@
import React, { PropTypes } from 'react'
import FolderRow from './FolderRow'
import linkState from 'browser/lib/linkState'
import { createFolder } from '../../actions'
export default class FolderSettingTab extends React.Component {
constructor (props) {
@@ -23,9 +22,9 @@ export default class FolderSettingTab extends React.Component {
let { dispatch } = this.props
try {
dispatch(createFolder({
name: this.state.name
}))
// dispatch(createFolder({
// name: this.state.name
// }))
} catch (e) {
this.setState({alert: {
type: 'error',