gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix #529 - Make hashtag timelines show conversations, fix hashtag loading in the UI

Browse source
This commit is contained in:
Eugen Rochko 2017-01-31 22:34:33 +01:00
parent 8ef79d8dc9
commit bf60f2898d
6 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/components/features/account_timeline/index.jsx
View file

@ -11,9 +11,10 @@ import LoadingIndicator from '../../components/loading_indicator';
import Column from '../ui/components/column';
import HeaderContainer from './containers/header_container';
import ColumnBackButton from '../../components/column_back_button';
import Immutable from 'immutable';
const mapStateToProps = (state, props) => ({
statusIds: state.getIn(['timelines', 'accounts_timelines', Number(props.params.accountId), 'items']),
statusIds: state.getIn(['timelines', 'accounts_timelines', Number(props.params.accountId), 'items'], Immutable.List()),
isLoading: state.getIn(['timelines', 'accounts_timelines', Number(props.params.accountId), 'isLoading']),
me: state.getIn(['meta', 'me'])
});
@ -49,7 +50,7 @@ const AccountTimeline = React.createClass({
render () {
const { statusIds, isLoading, me } = this.props;
if (!statusIds) {
if (!statusIds && isLoading) {
return (
<Column>
<LoadingIndicator />