summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-06-10 12:29:19 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-06-10 12:29:19 +0900
commit9d248dbb5ace6b29173f6df1ec484a14f2d22bad (patch)
treec3a06430d3d32296a4be36876e952a228f4cdbc0 /src
parent2.36.0 (diff)
downloadsharkey-9d248dbb5ace6b29173f6df1ec484a14f2d22bad.tar.gz
sharkey-9d248dbb5ace6b29173f6df1ec484a14f2d22bad.tar.bz2
sharkey-9d248dbb5ace6b29173f6df1ec484a14f2d22bad.zip
:art:
Diffstat (limited to 'src')
-rw-r--r--src/client/app/desktop/views/components/note-preview.vue14
-rw-r--r--src/client/app/desktop/views/pages/deck/deck.note.vue2
2 files changed, 13 insertions, 3 deletions
diff --git a/src/client/app/desktop/views/components/note-preview.vue b/src/client/app/desktop/views/components/note-preview.vue
index 2599439f09..2a49557247 100644
--- a/src/client/app/desktop/views/components/note-preview.vue
+++ b/src/client/app/desktop/views/components/note-preview.vue
@@ -1,6 +1,6 @@
<template>
<div class="mk-note-preview" :title="title">
- <mk-avatar class="avatar" :user="note.user"/>
+ <mk-avatar class="avatar" :user="note.user" v-if="!mini"/>
<div class="main">
<mk-note-header class="header" :note="note" :mini="true"/>
<div class="body">
@@ -15,7 +15,17 @@ import Vue from 'vue';
import dateStringify from '../../../common/scripts/date-stringify';
export default Vue.extend({
- props: ['note'],
+ props: {
+ note: {
+ type: Object,
+ required: true
+ },
+ mini: {
+ type: Boolean,
+ required: false,
+ default: false
+ }
+ },
computed: {
title(): string {
return dateStringify(this.note.createdAt);
diff --git a/src/client/app/desktop/views/pages/deck/deck.note.vue b/src/client/app/desktop/views/pages/deck/deck.note.vue
index bf830b92ef..5a8dc2ea65 100644
--- a/src/client/app/desktop/views/pages/deck/deck.note.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.note.vue
@@ -37,7 +37,7 @@
</div>
<a class="location" v-if="p.geo" :href="`http://maps.google.com/maps?q=${p.geo.coordinates[1]},${p.geo.coordinates[0]}`" target="_blank">%fa:map-marker-alt% %i18n:@location%</a>
<div class="renote" v-if="p.renote">
- <mk-note-preview :note="p.renote"/>
+ <mk-note-preview :note="p.renote" :mini="true"/>
</div>
</div>
<span class="app" v-if="p.app">via <b>{{ p.app.name }}</b></span>