1
0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 17:56:25 +00:00

change getTodoState to getTodoStatus

This commit is contained in:
XGHeaven
2017-08-10 19:58:58 +08:00
parent 1c7cba2951
commit e934182e86
4 changed files with 7 additions and 7 deletions

View File

@@ -4,7 +4,7 @@
import React, { PropTypes } from 'react' import React, { PropTypes } from 'react'
import { isArray } from 'lodash' import { isArray } from 'lodash'
import CSSModules from 'browser/lib/CSSModules' import CSSModules from 'browser/lib/CSSModules'
import { getTodoState } from 'browser/lib/getTodoState' import { getTodoStatus } from 'browser/lib/getTodoStatus'
import styles from './NoteItem.styl' import styles from './NoteItem.styl'
import TodoProcess from './TodoProcess' import TodoProcess from './TodoProcess'
@@ -79,7 +79,7 @@ const NoteItem = ({ isActive, note, dateDisplay, handleNoteClick, handleDragStar
</div> </div>
</div> </div>
{note.type === 'MARKDOWN_NOTE' {note.type === 'MARKDOWN_NOTE'
? <TodoProcess todoState={getTodoState(note.content)} /> ? <TodoProcess todoStatus={getTodoStatus(note.content)} />
: '' : ''
} }
</div> </div>

View File

@@ -7,7 +7,7 @@ import CSSModules from 'browser/lib/CSSModules'
import styles from './TodoProcess.styl' import styles from './TodoProcess.styl'
const TodoProcess = ({ const TodoProcess = ({
todoState: { todoStatus: {
total: totalTodo, total: totalTodo,
completed: completedTodo completed: completedTodo
} }
@@ -24,7 +24,7 @@ const TodoProcess = ({
) )
TodoProcess.propTypes = { TodoProcess.propTypes = {
todoState: { todoStatus: {
total: PropTypes.number.isRequired, total: PropTypes.number.isRequired,
completed: PropTypes.number.isRequired completed: PropTypes.number.isRequired
} }

View File

@@ -1,4 +1,4 @@
export function getTodoState (content) { export function getTodoStatus (content) {
let splitted = content.split('\n') let splitted = content.split('\n')
let numberOfTodo = 0 let numberOfTodo = 0
let numberOfCompletedTodo = 0 let numberOfCompletedTodo = 0
@@ -20,6 +20,6 @@ export function getTodoState (content) {
} }
export function getTodoPercentageOfCompleted (content) { export function getTodoPercentageOfCompleted (content) {
const state = getTodoState(content) const state = getTodoStatus(content)
return Math.floor(state.completed / state.total * 100) return Math.floor(state.completed / state.total * 100)
} }

View File

@@ -18,7 +18,7 @@ import TrashButton from './TrashButton'
import InfoButton from './InfoButton' import InfoButton from './InfoButton'
import InfoPanel from './InfoPanel' import InfoPanel from './InfoPanel'
import { formatDate } from 'browser/lib/date-formatter' import { formatDate } from 'browser/lib/date-formatter'
import { getTodoPercentageOfCompleted } from 'browser/lib/getTodoState' import { getTodoPercentageOfCompleted } from 'browser/lib/getTodoStatus'
const electron = require('electron') const electron = require('electron')
const { remote } = electron const { remote } = electron