autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #642 - Add "empty column" text to home/notifications

Browse Source
This commit is contained in:
Eugen Rochko
2017-02-18 02:37:59 +01:00
parent 1d5dfda3d4
commit 9e99b8c068
7 changed files with 89 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/assets/javascripts/components/components/status_list.jsx
View File

@ -14,7 +14,8 @@ const StatusList = React.createClass({
onScroll: React.PropTypes.func,
trackScroll: React.PropTypes.bool,
isLoading: React.PropTypes.bool,
prepend: React.PropTypes.node
prepend: React.PropTypes.node,
emptyMessage: React.PropTypes.node
},
getDefaultProps () {
@ -71,27 +72,36 @@ const StatusList = React.createClass({
},
render () {
const { statusIds, onScrollToBottom, trackScroll, isLoading, prepend } = this.props;
const { statusIds, onScrollToBottom, trackScroll, isLoading, prepend, emptyMessage } = this.props;
let loadMore = '';
let scrollableArea = '';
if (!isLoading && statusIds.size > 0) {
loadMore = <LoadMore onClick={this.handleLoadMore} />;
}
const scrollableArea = (
<div className='scrollable' ref={this.setRef}>
<div>
{prepend}
if (isLoading || statusIds.size > 0 || !emptyMessage) {
scrollableArea = (
<div className='scrollable' ref={this.setRef}>
<div>
{prepend}
{statusIds.map((statusId) => {
return <StatusContainer key={statusId} id={statusId} />;
})}
{statusIds.map((statusId) => {
return <StatusContainer key={statusId} id={statusId} />;
})}
{loadMore}
{loadMore}
</div>
</div>
</div>
);
);
} else {
scrollableArea = (
<div className='empty-column-indicator' ref={this.setRef}>
{emptyMessage}
</div>
);
}
if (trackScroll) {
return (