diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2020-01-31 11:38:52 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2020-01-31 11:38:52 +0900 |
| commit | 73e7c1bf67c4d55adbe4c1a6f766aac735d40f80 (patch) | |
| tree | 1fa412aa0de9f6d5204128a3be5571760f0f0d89 /src/client | |
| parent | Resolve #2230 (diff) | |
| download | misskey-73e7c1bf67c4d55adbe4c1a6f766aac735d40f80.tar.gz misskey-73e7c1bf67c4d55adbe4c1a6f766aac735d40f80.tar.bz2 misskey-73e7c1bf67c4d55adbe4c1a6f766aac735d40f80.zip | |
Refactor
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/components/notification.vue | 18 | ||||
| -rw-r--r-- | src/client/components/notifications.vue | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/client/components/notification.vue b/src/client/components/notification.vue index 6a9129e38e..7542a77092 100644 --- a/src/client/components/notification.vue +++ b/src/client/components/notification.vue @@ -20,26 +20,26 @@ </header> <router-link v-if="notification.type === 'reaction'" class="text" :to="notification.note | notePage" :title="getNoteSummary(notification.note)"> <fa :icon="faQuoteLeft"/> - <mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="nowrap" :custom-emojis="notification.note.emojis"/> + <mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/> <fa :icon="faQuoteRight"/> </router-link> <router-link v-if="notification.type === 'renote'" class="text" :to="notification.note | notePage" :title="getNoteSummary(notification.note.renote)"> <fa :icon="faQuoteLeft"/> - <mfm :text="getNoteSummary(notification.note.renote)" :plain="true" :nowrap="nowrap" :custom-emojis="notification.note.renote.emojis"/> + <mfm :text="getNoteSummary(notification.note.renote)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.renote.emojis"/> <fa :icon="faQuoteRight"/> </router-link> <router-link v-if="notification.type === 'reply'" class="text" :to="notification.note | notePage" :title="getNoteSummary(notification.note)"> - <mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="nowrap" :custom-emojis="notification.note.emojis"/> + <mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/> </router-link> <router-link v-if="notification.type === 'mention'" class="text" :to="notification.note | notePage" :title="getNoteSummary(notification.note)"> - <mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="nowrap" :custom-emojis="notification.note.emojis"/> + <mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/> </router-link> <router-link v-if="notification.type === 'quote'" class="text" :to="notification.note | notePage" :title="getNoteSummary(notification.note)"> - <mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="nowrap" :custom-emojis="notification.note.emojis"/> + <mfm :text="getNoteSummary(notification.note)" :plain="true" :nowrap="!full" :custom-emojis="notification.note.emojis"/> </router-link> - <span v-if="notification.type === 'follow'" class="text" style="opacity: 0.6;">{{ $t('youGotNewFollower') }}<div v-if="!nowrap"><mk-follow-button :user="notification.user"/></div></span> + <span v-if="notification.type === 'follow'" class="text" style="opacity: 0.6;">{{ $t('youGotNewFollower') }}<div v-if="full"><mk-follow-button :user="notification.user"/></div></span> <span v-if="notification.type === 'followRequestAccepted'" class="text" style="opacity: 0.6;">{{ $t('followRequestAccepted') }}</span> - <span v-if="notification.type === 'receiveFollowRequest'" class="text" style="opacity: 0.6;">{{ $t('receiveFollowRequest') }}<div v-if="!nowrap && !followRequestDone"><button class="_textButton" @click="acceptFollowRequest()">{{ $t('accept') }}</button> | <button class="_textButton" @click="rejectFollowRequest()">{{ $t('reject') }}</button></div></span> + <span v-if="notification.type === 'receiveFollowRequest'" class="text" style="opacity: 0.6;">{{ $t('receiveFollowRequest') }}<div v-if="full && !followRequestDone"><button class="_textButton" @click="acceptFollowRequest()">{{ $t('accept') }}</button> | <button class="_textButton" @click="rejectFollowRequest()">{{ $t('reject') }}</button></div></span> </div> </div> </template> @@ -68,10 +68,10 @@ export default Vue.extend({ required: false, default: false, }, - nowrap: { + full: { type: Boolean, required: false, - default: true, + default: false, }, }, data() { diff --git a/src/client/components/notifications.vue b/src/client/components/notifications.vue index ad82913380..e067c1acce 100644 --- a/src/client/components/notifications.vue +++ b/src/client/components/notifications.vue @@ -2,7 +2,7 @@ <div class="mk-notifications"> <div class="contents"> <x-list class="notifications" :items="items" v-slot="{ item: notification, i }"> - <x-notification :notification="notification" :with-time="true" :nowrap="false" class="notification" :key="notification.id" :data-index="i"/> + <x-notification :notification="notification" :with-time="true" :full="true" class="notification" :key="notification.id" :data-index="i"/> </x-list> <button class="more _button" v-if="more" @click="fetchMore" :disabled="moreFetching"> |