diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-08-17 08:12:21 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-08-17 08:12:21 +0000 |
| commit | e5fe4f420ca66f3916bc986ee9d65ce6a9bf75aa (patch) | |
| tree | 5de744e4a1437d51d6849450a8456ba6e76fac88 /src/components/search/search.vue | |
| parent | 9f6be4fe654a26d57c67cbe0f42cd3bbb1b37e92 (diff) | |
| parent | 7dfcabb5433a5eb805bbda6ef87390c6ed2d5372 (diff) | |
Merge branch '564' into 'develop'
Restore scroll position for user profile when navigate back and forward
Closes #636 and #564
See merge request pleroma/pleroma-fe!914
Diffstat (limited to 'src/components/search/search.vue')
| -rw-r--r-- | src/components/search/search.vue | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/components/search/search.vue b/src/components/search/search.vue index 4350e672..746bbaa2 100644 --- a/src/components/search/search.vue +++ b/src/components/search/search.vue @@ -31,21 +31,18 @@ <tab-switcher ref="tabSwitcher" :on-switch="onResultTabSwitch" - :custom-active="currenResultTab" + :active-tab="currenResultTab" > <span - data-tab-dummy - data-filter="statuses" + key="statuses" :label="$t('user_card.statuses') + resultCount('visibleStatuses')" /> <span - data-tab-dummy - data-filter="people" + key="people" :label="$t('search.people') + resultCount('users')" /> <span - data-tab-dummy - data-filter="hashtags" + key="hashtags" :label="$t('search.hashtags') + resultCount('hashtags')" /> </tab-switcher> |