From e934182e868209e4fa703d60bf83c43a5428b1c6 Mon Sep 17 00:00:00 2001 From: XGHeaven Date: Thu, 10 Aug 2017 19:58:58 +0800 Subject: [PATCH] change getTodoState to getTodoStatus --- browser/components/NoteItem.js | 4 ++-- browser/components/TodoProcess.js | 4 ++-- browser/lib/{getTodoState.js => getTodoStatus.js} | 4 ++-- browser/main/Detail/MarkdownNoteDetail.js | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) rename browser/lib/{getTodoState.js => getTodoStatus.js} (86%) diff --git a/browser/components/NoteItem.js b/browser/components/NoteItem.js index b102d6f7..79eed23a 100644 --- a/browser/components/NoteItem.js +++ b/browser/components/NoteItem.js @@ -4,7 +4,7 @@ import React, { PropTypes } from 'react' import { isArray } from 'lodash' import CSSModules from 'browser/lib/CSSModules' -import { getTodoState } from 'browser/lib/getTodoState' +import { getTodoStatus } from 'browser/lib/getTodoStatus' import styles from './NoteItem.styl' import TodoProcess from './TodoProcess' @@ -79,7 +79,7 @@ const NoteItem = ({ isActive, note, dateDisplay, handleNoteClick, handleDragStar {note.type === 'MARKDOWN_NOTE' - ? + ? : '' } diff --git a/browser/components/TodoProcess.js b/browser/components/TodoProcess.js index 0d545948..91c8a943 100644 --- a/browser/components/TodoProcess.js +++ b/browser/components/TodoProcess.js @@ -7,7 +7,7 @@ import CSSModules from 'browser/lib/CSSModules' import styles from './TodoProcess.styl' const TodoProcess = ({ - todoState: { + todoStatus: { total: totalTodo, completed: completedTodo } @@ -24,7 +24,7 @@ const TodoProcess = ({ ) TodoProcess.propTypes = { - todoState: { + todoStatus: { total: PropTypes.number.isRequired, completed: PropTypes.number.isRequired } diff --git a/browser/lib/getTodoState.js b/browser/lib/getTodoStatus.js similarity index 86% rename from browser/lib/getTodoState.js rename to browser/lib/getTodoStatus.js index f1b35232..d65e4946 100644 --- a/browser/lib/getTodoState.js +++ b/browser/lib/getTodoStatus.js @@ -1,4 +1,4 @@ -export function getTodoState (content) { +export function getTodoStatus (content) { let splitted = content.split('\n') let numberOfTodo = 0 let numberOfCompletedTodo = 0 @@ -20,6 +20,6 @@ export function getTodoState (content) { } export function getTodoPercentageOfCompleted (content) { - const state = getTodoState(content) + const state = getTodoStatus(content) return Math.floor(state.completed / state.total * 100) } diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 37452639..c01aaa92 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -18,7 +18,7 @@ import TrashButton from './TrashButton' import InfoButton from './InfoButton' import InfoPanel from './InfoPanel' import { formatDate } from 'browser/lib/date-formatter' -import { getTodoPercentageOfCompleted } from 'browser/lib/getTodoState' +import { getTodoPercentageOfCompleted } from 'browser/lib/getTodoStatus' const electron = require('electron') const { remote } = electron