Skip to content
Snippets Groups Projects
Commit 9b3ceeab authored by john's avatar john
Browse files

chapter refactor -- done

parent 451bd0d0
No related branches found
No related tags found
No related merge requests found
...@@ -32,6 +32,7 @@ export class Chapter extends React.Component { ...@@ -32,6 +32,7 @@ export class Chapter extends React.Component {
ink, ink,
isDragging, isDragging,
outerContainer, outerContainer,
remove,
roles, roles,
title, title,
type type
...@@ -59,6 +60,7 @@ export class Chapter extends React.Component { ...@@ -59,6 +60,7 @@ export class Chapter extends React.Component {
book={book} book={book}
chapter={chapter} chapter={chapter}
outerContainer={outerContainer} outerContainer={outerContainer}
remove={remove}
roles={roles} roles={roles}
title={title} title={title}
type={type} type={type}
......
...@@ -22,7 +22,8 @@ class AlignmentBox extends React.Component { ...@@ -22,7 +22,8 @@ class AlignmentBox extends React.Component {
const { chapter, position } = this.props const { chapter, position } = this.props
const selected = chapter.alignment[position] const selected = chapter.alignment[position]
const outerClass = styles.leftRightBox + ' ' + styles.leftBox // TODO -- fix classes here
const outerClass = styles.leftRightBox + ' ' + styles[position + 'Box']
const innerClass = selected ? styles.boxActive : styles.boxInactiveHover const innerClass = selected ? styles.boxActive : styles.boxInactiveHover
return ( return (
......
...@@ -70,16 +70,15 @@ class ChapterButtons extends React.Component { ...@@ -70,16 +70,15 @@ class ChapterButtons extends React.Component {
} }
renderRenameButton () { renderRenameButton () {
const { chapter, isRenaming } = this.props const { isRenaming, onClickRename, onSaveRename, type } = this.props
const type = chapter.type
if (type === 'chapter' || type === 'part') { if (type === 'chapter' || type === 'part') {
let renameButtonText = 'Rename' let renameButtonText = 'Rename'
let renameButtonFunction = this.onClickRename let renameButtonFunction = onClickRename
if (isRenaming) { if (isRenaming) {
renameButtonText = 'Save' renameButtonText = 'Save'
renameButtonFunction = this.onSaveRename renameButtonFunction = onSaveRename
} }
return ( return (
...@@ -164,6 +163,7 @@ ChapterButtons.propTypes = { ...@@ -164,6 +163,7 @@ ChapterButtons.propTypes = {
onSaveRename: React.PropTypes.func.isRequired, onSaveRename: React.PropTypes.func.isRequired,
remove: React.PropTypes.func.isRequired, remove: React.PropTypes.func.isRequired,
roles: React.PropTypes.array.isRequired, roles: React.PropTypes.array.isRequired,
type: React.PropTypes.string.isRequired,
update: React.PropTypes.func.isRequired update: React.PropTypes.func.isRequired
} }
......
...@@ -26,8 +26,11 @@ class ChapterFirstRow extends React.Component { ...@@ -26,8 +26,11 @@ class ChapterFirstRow extends React.Component {
onSaveRename (title) { onSaveRename (title) {
const { book, chapter, update } = this.props const { book, chapter, update } = this.props
// handle save button click (from outside the component) // TODO -- DOESN'T WORK ANYMORE
if (typeof title !== 'string') title = this.refs.chapterInput.state.value // handle save button click (from outside the text input component)
if (typeof title !== 'string') {
title = this.refs.chapterInput.state.value
}
if (title.length === 0) return this.setState({ isRenameEmpty: true }) if (title.length === 0) return this.setState({ isRenameEmpty: true })
this.setState({ isRenameEmpty: false }) this.setState({ isRenameEmpty: false })
...@@ -61,8 +64,11 @@ class ChapterFirstRow extends React.Component { ...@@ -61,8 +64,11 @@ class ChapterFirstRow extends React.Component {
chapter={chapter} chapter={chapter}
isRenaming={isRenamingTitle} isRenaming={isRenamingTitle}
modalContainer={outerContainer} modalContainer={outerContainer}
onClickRename={this.onClickRename}
onSaveRename={this.onSaveRename}
remove={remove} remove={remove}
roles={roles} roles={roles}
type={type}
update={update} update={update}
/> />
</span> </span>
......
...@@ -51,7 +51,7 @@ export class ProgressItem extends React.Component { ...@@ -51,7 +51,7 @@ export class ProgressItem extends React.Component {
chapter.progress[type] = position chapter.progress[type] = position
update(chapter) update(chapter)
this.setState({ showWarning: false }) this.setState({ showModal: false })
} }
canChange () { canChange () {
...@@ -170,7 +170,6 @@ ProgressItem.propTypes = { ...@@ -170,7 +170,6 @@ ProgressItem.propTypes = {
roles: React.PropTypes.array.isRequired, roles: React.PropTypes.array.isRequired,
type: React.PropTypes.string.isRequired, type: React.PropTypes.string.isRequired,
update: React.PropTypes.func.isRequired update: React.PropTypes.func.isRequired
// viewOrEdit: React.PropTypes.func
} }
export default ProgressItem export default ProgressItem
...@@ -12,11 +12,9 @@ class ProgressList extends React.Component { ...@@ -12,11 +12,9 @@ class ProgressList extends React.Component {
<ProgressItem <ProgressItem
chapter={chapter} chapter={chapter}
hasIcon hasIcon
// modalContainer={modalContainer}
roles={roles} roles={roles}
type='style' type='style'
update={update} update={update}
// viewOrEdit={this._viewOrEdit}
/> />
<ProgressItem <ProgressItem
...@@ -26,7 +24,6 @@ class ProgressList extends React.Component { ...@@ -26,7 +24,6 @@ class ProgressList extends React.Component {
roles={roles} roles={roles}
type='edit' type='edit'
update={update} update={update}
// viewOrEdit={this._viewOrEdit}
/> />
<ProgressItem <ProgressItem
...@@ -36,16 +33,13 @@ class ProgressList extends React.Component { ...@@ -36,16 +33,13 @@ class ProgressList extends React.Component {
roles={roles} roles={roles}
type='review' type='review'
update={update} update={update}
// viewOrEdit={this._viewOrEdit}
/> />
<ProgressItem <ProgressItem
chapter={chapter} chapter={chapter}
// modalContainer={modalContainer}
roles={roles} roles={roles}
type='clean' type='clean'
update={update} update={update}
// viewOrEdit={this._viewOrEdit}
/> />
</ul> </ul>
) )
......
...@@ -57,7 +57,7 @@ export class BookBuilderModal extends React.Component { ...@@ -57,7 +57,7 @@ export class BookBuilderModal extends React.Component {
} else if (action === 'workflow-warning') { } else if (action === 'workflow-warning') {
modalBodyText = ( modalBodyText = (
<div> <div>
This action will revoke your access to this fragment. This action will revoke your write access to this fragment.
<br /> <br />
Are you sure you want to continue? Are you sure you want to continue?
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment