Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

MM-15359 Fix double loading search indicators #2740

Merged
merged 1 commit into from
May 3, 2019
Merged

MM-15359 Fix double loading search indicators #2740

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions components/search_results/search_results.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ export default class SearchResults extends React.PureComponent {
const searchTerms = this.props.searchTerms;

let ctls = null;
let loadingMorePostsComponent = null;

if (
this.props.isSearchingTerm ||
Expand Down Expand Up @@ -194,19 +195,18 @@ export default class SearchResults extends React.PureComponent {
/>
);
}, this);
}

let loadingMorePostsComponent = null;
if (!this.props.isSearchAtEnd && !this.props.isFlaggedPosts && !this.props.isPinnedPosts) {
loadingMorePostsComponent = (
<div className='loading-screen'>
<div className='loading__content'>
<div className='round round-1'/>
<div className='round round-2'/>
<div className='round round-3'/>
if (!this.props.isSearchAtEnd && !this.props.isFlaggedPosts && !this.props.isPinnedPosts) {
loadingMorePostsComponent = (
<div className='loading-screen'>
<div className='loading__content'>
<div className='round round-1'/>
<div className='round round-2'/>
<div className='round round-3'/>
</div>
</div>
</div>
);
);
}
}

return (
Expand Down