Compare commits
2 Commits
60d0c91eb9
...
76b44d3a39
Author | SHA1 | Date |
---|---|---|
itepechi | 76b44d3a39 | |
itepechi | b2d30e5c34 |
|
@ -124,9 +124,11 @@ const Search = {
|
||||||
|
|
||||||
let searchTypes = allSearchTypes
|
let searchTypes = allSearchTypes
|
||||||
if (searchType) {
|
if (searchType) {
|
||||||
|
// Search only for `searchType` if it is provided
|
||||||
searchTypes = [searchType]
|
searchTypes = [searchType]
|
||||||
} else if (this.currentResultTab !== 'statuses') {
|
} else if (this.hasUserSelectedTab && this.currentResultTab !== 'statuses') {
|
||||||
// Sort search order; selected tab first
|
// Start the search from the tab that the user has selected
|
||||||
|
// No need to sort if userPreferredTab === 'statuses'
|
||||||
searchTypes = [
|
searchTypes = [
|
||||||
this.currentResultTab,
|
this.currentResultTab,
|
||||||
...allSearchTypes.filter((tab) => tab !== this.currentResultTab)
|
...allSearchTypes.filter((tab) => tab !== this.currentResultTab)
|
||||||
|
|
|
@ -75,7 +75,7 @@
|
||||||
<button
|
<button
|
||||||
v-if="!loading['statuses'] && loadedInitially && lastStatusFetchCount > 0"
|
v-if="!loading['statuses'] && loadedInitially && lastStatusFetchCount > 0"
|
||||||
class="more-statuses-button button-unstyled -link -fullwidth"
|
class="more-statuses-button button-unstyled -link -fullwidth"
|
||||||
@click.prevent="search(searchTerm, 'statuses')"
|
@click.prevent="search(lastQuery, 'statuses')"
|
||||||
>
|
>
|
||||||
<div class="new-status-notification text-center">
|
<div class="new-status-notification text-center">
|
||||||
{{ $t('search.load_more') }}
|
{{ $t('search.load_more') }}
|
||||||
|
@ -114,7 +114,7 @@
|
||||||
<button
|
<button
|
||||||
v-if="!loading['media'] && loadedInitially && lastMediaFetchCount > 0"
|
v-if="!loading['media'] && loadedInitially && lastMediaFetchCount > 0"
|
||||||
class="more-statuses-button button-unstyled -link -fullwidth"
|
class="more-statuses-button button-unstyled -link -fullwidth"
|
||||||
@click.prevent="search(searchTerm, 'media')"
|
@click.prevent="search(lastQuery, 'media')"
|
||||||
>
|
>
|
||||||
<div class="new-status-notification text-center">
|
<div class="new-status-notification text-center">
|
||||||
{{ $t('search.load_more') }}
|
{{ $t('search.load_more') }}
|
||||||
|
|
Loading…
Reference in New Issue