mirror of
https://github.com/flarum/core.git
synced 2025-08-14 04:14:06 +02:00
Compare commits
2 Commits
v1.0.3
...
ds/discuss
Author | SHA1 | Date | |
---|---|---|---|
|
0035cefa14 | ||
|
a27f540aab |
@@ -41,13 +41,28 @@ export default class DiscussionList extends Component {
|
||||
|
||||
return (
|
||||
<div className={'DiscussionList' + (state.isSearchResults() ? ' DiscussionList--searchResults' : '')}>
|
||||
{state.hasPrev() && (
|
||||
<div className="DiscussionList-loadPrev">
|
||||
{state.isLoadingPrev() ? (
|
||||
<LoadingIndicator />
|
||||
) : (
|
||||
<Button className="Button" onclick={state.loadPrev.bind(state)}>
|
||||
{app.translator.trans('core.forum.discussion_list.load_prev_button')}
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<ul className="DiscussionList-discussions">
|
||||
{state.getPages().map((pg) => {
|
||||
return pg.items.map((discussion) => (
|
||||
<li key={discussion.id()} data-id={discussion.id()}>
|
||||
{DiscussionListItem.component({ discussion, params })}
|
||||
</li>
|
||||
));
|
||||
return [
|
||||
<hr key={`page-${pg.number}`} data-page={pg.number} />,
|
||||
...pg.items.map((discussion) => (
|
||||
<li key={discussion.id()} data-id={discussion.id()}>
|
||||
{DiscussionListItem.component({ discussion, params })}
|
||||
</li>
|
||||
)),
|
||||
];
|
||||
})}
|
||||
</ul>
|
||||
<div className="DiscussionList-loadMore">{loading}</div>
|
||||
|
@@ -7,8 +7,12 @@
|
||||
list-style-type: none;
|
||||
position: relative;
|
||||
}
|
||||
.DiscussionList-loadMore {
|
||||
|
||||
.DiscussionList-loadMore, .DiscussionList-loadPrev {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.DiscussionList-loadMore {
|
||||
margin-top: 10px;
|
||||
|
||||
.LoadingIndicator-container {
|
||||
@@ -16,6 +20,10 @@
|
||||
}
|
||||
}
|
||||
|
||||
.DiscussionList-loadPrev .LoadingIndicator-container {
|
||||
height: 36px;
|
||||
}
|
||||
|
||||
@media @phone {
|
||||
.DiscussionList {
|
||||
margin: 0 -15px;
|
||||
|
Reference in New Issue
Block a user