Compare commits
No commits in common. "76b44d3a3903c1f24b12b2eea0a3c8c592bbb092" and "60d0c91eb96334546afd6a44160ba959d2dd0285" have entirely different histories.
76b44d3a39
...
60d0c91eb9
|
@ -124,11 +124,9 @@ 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.hasUserSelectedTab && this.currentResultTab !== 'statuses') {
|
} else if (this.currentResultTab !== 'statuses') {
|
||||||
// Start the search from the tab that the user has selected
|
// Sort search order; selected tab first
|
||||||
// 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(lastQuery, 'statuses')"
|
@click.prevent="search(searchTerm, '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(lastQuery, 'media')"
|
@click.prevent="search(searchTerm, '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