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

Merge remote-tracking branch 'parent/main' into kb_lts

Browse source
This commit is contained in:
KMY 2023-09-18 19:33:00 +09:00
commit 7a36615f0e
5 changed files with 146 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/mastodon/features/compose/components/search_results.jsx
View file

@ -29,7 +29,6 @@ class SearchResults extends ImmutablePureComponent {
results: ImmutablePropTypes.map.isRequired,
expandSearch: PropTypes.func.isRequired,
searchTerm: PropTypes.string,
noMoreResults: ImmutablePropTypes.map,
};
handleLoadMoreAccounts = () => this.props.expandSearch('accounts');
@ -38,8 +37,6 @@ class SearchResults extends ImmutablePureComponent {
handleLoadMoreHashtags = () => this.props.expandSearch('hashtags');
showMoreResults = (searchType) => this.props.noMoreResults ? !this.props.noMoreResults.get(searchType) : true;
render () {
const { results } = this.props;