diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-03-13 17:31:46 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-03-13 17:31:46 +0000 |
| commit | e34d71fc1f64fde73e435262979e5e93ebd37df2 (patch) | |
| tree | 8b43c0e6f070c7f5a5fd72d1fcc986ca52524ed2 /src/components/status/status.vue | |
| parent | 89efb0d2f4ab41eb020e6a6b7bb14dbe20e53157 (diff) | |
| parent | 551b8f3690bab1f53ec22ccf6963009a30fa45d0 (diff) | |
Merge branch 'from/develop/tusooa/tree-threading' into 'develop'
Add the option to display threads as trees
See merge request pleroma/pleroma-fe!1407
Diffstat (limited to 'src/components/status/status.vue')
| -rw-r--r-- | src/components/status/status.vue | 46 |
1 files changed, 45 insertions, 1 deletions
diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 8f51a778..1679834e 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -221,6 +221,31 @@ class="fa-scale-110" /> </button> + <button + v-if="inThreadForest && replies && replies.length && !simpleTree" + class="button-unstyled" + :title="threadShowing ? $t('status.thread_hide') : $t('status.thread_show')" + :aria-expanded="threadShowing ? 'true' : 'false'" + @click.prevent="toggleThreadDisplay" + > + <FAIcon + fixed-width + class="fa-scale-110" + :icon="threadShowing ? 'chevron-up' : 'chevron-down'" + /> + </button> + <button + v-if="dive && !simpleTree" + class="button-unstyled" + :title="$t('status.show_only_conversation_under_this')" + @click.prevent="dive" + > + <FAIcon + fixed-width + class="fa-scale-110" + :icon="'angle-double-right'" + /> + </button> </span> </div> <div @@ -308,6 +333,12 @@ :no-heading="noHeading" :highlight="highlight" :focused="isFocused" + :controlled-showing-tall="controlledShowingTall" + :controlled-expanding-subject="controlledExpandingSubject" + :controlled-showing-long-subject="controlledShowingLongSubject" + :controlled-toggle-showing-tall="controlledToggleShowingTall" + :controlled-toggle-expanding-subject="controlledToggleExpandingSubject" + :controlled-toggle-showing-long-subject="controlledToggleShowingLongSubject" @mediaplay="addMediaPlaying($event)" @mediapause="removeMediaPlaying($event)" @parseReady="setHeadTailLinks" @@ -317,7 +348,20 @@ v-if="inConversation && !isPreview && replies && replies.length" class="replies" > - <span class="faint">{{ $t('status.replies_list') }}</span> + <button + v-if="showOtherRepliesAsButton && replies.length > 1" + class="button-unstyled -link faint" + :title="$tc('status.ancestor_follow', replies.length - 1, { numReplies: replies.length - 1 })" + @click.prevent="dive" + > + {{ $tc('status.replies_list_with_others', replies.length - 1, { numReplies: replies.length - 1 }) }} + </button> + <span + v-else + class="faint" + > + {{ $t('status.replies_list') }} + </span> <StatusPopover v-for="reply in replies" :key="reply.id" |