This repository has been archived by the owner on Jun 28, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 362
React loadable #701
Merged
Merged
React loadable #701
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| import React, { PropTypes } from 'react'; | ||
|
|
||
| const ComponentLoader = ({ isLoading, error, pastDelay }) => { | ||
| if (isLoading) { | ||
| return pastDelay ? <div>Loading...</div> : null; | ||
| } else if (error) { | ||
| return <div>Error! Component failed to load</div>; | ||
| } | ||
|
|
||
| return null; | ||
| }; | ||
|
|
||
| ComponentLoader.propTypes = { | ||
| isLoading: PropTypes.bool, | ||
| error: PropTypes.any, // eslint-disable-line | ||
| pastDelay: PropTypes.bool | ||
| }; | ||
|
|
||
| export default ComponentLoader; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| import React, { PropTypes } from 'react'; | ||
|
|
||
| import Line from 'components/Line'; | ||
| import PageBreak from 'components/PageBreak'; | ||
|
|
||
| const PageView = ({ lines, keys, currentVerse, options, isPlaying, audioActions }) => { | ||
| const elements = keys.map((lineNum, index) => { | ||
| const nextNum = keys[index + 1]; | ||
| const pageNum = lineNum.split('-')[0]; | ||
| const line = lines[lineNum]; | ||
|
|
||
| if (index + 1 !== keys.length && pageNum !== nextNum.split('-')[0]) { | ||
| return [ | ||
| <Line | ||
| line={line} | ||
| key={lineNum} | ||
| currentVerse={currentVerse} | ||
| tooltip={options.tooltip} | ||
| audioActions={audioActions} | ||
| isPlaying={isPlaying} | ||
| />, | ||
| <PageBreak pageNum={parseInt(pageNum, 10) + 1} /> | ||
| ]; | ||
| } | ||
|
|
||
| return ( | ||
| <Line | ||
| line={line} | ||
| key={lineNum} | ||
| currentVerse={currentVerse} | ||
| tooltip={options.tooltip} | ||
| audioActions={audioActions} | ||
| isPlaying={isPlaying} | ||
| /> | ||
| ); | ||
| }); | ||
|
|
||
| return ( | ||
| <div>{elements}</div> | ||
| ); | ||
| }; | ||
|
|
||
| PageView.propTypes = { | ||
| keys: PropTypes.array, // eslint-disable-line | ||
| lines: PropTypes.object.isRequired, // eslint-disable-line | ||
| audioActions: PropTypes.object.isRequired, // eslint-disable-line | ||
| currentVerse: PropTypes.string, | ||
| bookmarks: PropTypes.object.isRequired, // eslint-disable-line | ||
| options: PropTypes.object.isRequired, // eslint-disable-line | ||
| isPlaying: PropTypes.bool | ||
| }; | ||
|
|
||
| export default PageView; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
does static assets ( svg ) count in LOC ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LOC?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sorry, line of code :)