diff options
| author | 1STEP621 <86859447+1STEP621@users.noreply.github.com> | 2023-12-19 18:30:31 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-19 18:30:31 +0900 |
| commit | eeedef59c4ec2684e119dab0429dadcb13285469 (patch) | |
| tree | b48261bf1a2b30f3af5ad95a5fcb931c646e654b /packages | |
| parent | enhance: “つながりの公開範囲”がフォロー・フォロワー... (diff) | |
| download | sharkey-eeedef59c4ec2684e119dab0429dadcb13285469.tar.gz sharkey-eeedef59c4ec2684e119dab0429dadcb13285469.tar.bz2 sharkey-eeedef59c4ec2684e119dab0429dadcb13285469.zip | |
Fix(frontend): CWボタンに常に「引用」が出てしまうのを修正 (#12715)
* RNと引用RNの判定が間違っているのを修正
* remove dump.rdb
* update CHANGELOG.md
* lint fix
* fix cw button label
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/frontend/src/components/MkCwButton.vue | 2 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkNote.vue | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/frontend/src/components/MkCwButton.vue b/packages/frontend/src/components/MkCwButton.vue index a25193a57c..4a6d2dfba2 100644 --- a/packages/frontend/src/components/MkCwButton.vue +++ b/packages/frontend/src/components/MkCwButton.vue @@ -42,7 +42,7 @@ const emit = defineEmits<{ const label = computed(() => { return concat([ props.text ? [i18n.t('_cw.chars', { count: props.text.length })] : [], - props.renote != null ? [i18n.ts.quote] : [], + props.renote ? [i18n.ts.quote] : [], props.files.length !== 0 ? [i18n.t('_cw.files', { count: props.files.length })] : [], props.poll != null ? [i18n.ts.poll] : [], ] as string[][]).join(' / '); diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 609b381598..bb834a3845 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -54,7 +54,7 @@ SPDX-License-Identifier: AGPL-3.0-only <div style="container-type: inline-size;"> <p v-if="appearNote.cw != null" :class="$style.cw"> <Mfm v-if="appearNote.cw != ''" style="margin-right: 8px;" :text="appearNote.cw" :author="appearNote.user" :nyaize="'respect'"/> - <MkCwButton v-model="showContent" :text="appearNote.text" :renote="appearNote" :files="appearNote.files" :poll="appearNote.poll" style="margin: 4px 0;"/> + <MkCwButton v-model="showContent" :text="appearNote.text" :renote="appearNote.renote" :files="appearNote.files" :poll="appearNote.poll" style="margin: 4px 0;"/> </p> <div v-show="appearNote.cw == null || showContent" :class="[{ [$style.contentCollapsed]: collapsed }]"> <div :class="$style.text"> |