diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-01-06 12:56:13 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-01-06 12:56:13 +0900 |
| commit | a479e65f3e2ec7b6028c886d1d998a32927c8f48 (patch) | |
| tree | 234d32db1cf35ba3067bd29e6f6b9caeb69138de /src/client/app/desktop | |
| parent | Fix #3827 (#3837) (diff) | |
| download | misskey-a479e65f3e2ec7b6028c886d1d998a32927c8f48.tar.gz misskey-a479e65f3e2ec7b6028c886d1d998a32927c8f48.tar.bz2 misskey-a479e65f3e2ec7b6028c886d1d998a32927c8f48.zip | |
Compact URL preview (#3835)
* Compact url-preview
* fix header
* increase limit
* better limit
* Revert "better limit"
This reverts commit ef396f773394068b0b7e37fccff31c70661b3978.
ハードリミットかけるならサーバー上でかけたほうが良さそう
* Revert "increase limit"
This reverts commit 72c10a456ba37151a4d88d11544b0ff9daabd284.
Diffstat (limited to 'src/client/app/desktop')
| -rw-r--r-- | src/client/app/desktop/views/components/note.vue | 7 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/notes.vue | 2 | ||||
| -rw-r--r-- | src/client/app/desktop/views/pages/deck/deck.notes.vue | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/client/app/desktop/views/components/note.vue b/src/client/app/desktop/views/components/note.vue index a52eaac7e9..e5f233a552 100644 --- a/src/client/app/desktop/views/components/note.vue +++ b/src/client/app/desktop/views/components/note.vue @@ -36,7 +36,7 @@ <mk-poll v-if="appearNote.poll" :note="appearNote" ref="pollViewer"/> <a class="location" v-if="appearNote.geo" :href="`https://maps.google.com/maps?q=${appearNote.geo.coordinates[1]},${appearNote.geo.coordinates[0]}`" target="_blank"><fa icon="map-marker-alt"/> 位置情報</a> <div class="renote" v-if="appearNote.renote"><mk-note-preview :note="appearNote.renote" :mini="mini"/></div> - <mk-url-preview v-for="url in urls" :url="url" :key="url" :mini="mini"/> + <mk-url-preview v-for="url in urls" :url="url" :key="url" :mini="mini" :compact="compact"/> </div> </div> <footer v-if="appearNote.deletedAt == null"> @@ -102,6 +102,11 @@ export default Vue.extend({ required: false, default: false }, + compact: { + type: Boolean, + required: false, + default: false + }, mini: { type: Boolean, required: false, diff --git a/src/client/app/desktop/views/components/notes.vue b/src/client/app/desktop/views/components/notes.vue index da11893225..5cf51d9cc4 100644 --- a/src/client/app/desktop/views/components/notes.vue +++ b/src/client/app/desktop/views/components/notes.vue @@ -15,7 +15,7 @@ <!-- トランジションを有効にするとなぜかメモリリークする --> <component :is="!$store.state.device.reduceMotion ? 'transition-group' : 'div'" name="mk-notes" class="notes transition" tag="div" ref="notes"> <template v-for="(note, i) in _notes"> - <x-note :note="note" :key="note.id" @update:note="onNoteUpdated(i, $event)" ref="note"/> + <x-note :note="note" :key="note.id" @update:note="onNoteUpdated(i, $event)" :compact="true" ref="note"/> <p class="date" :key="note.id + '_date'" v-if="i != notes.length - 1 && note._date != _notes[i + 1]._date"> <span><fa icon="angle-up"/>{{ note._datetext }}</span> <span><fa icon="angle-down"/>{{ _notes[i + 1]._datetext }}</span> diff --git a/src/client/app/desktop/views/pages/deck/deck.notes.vue b/src/client/app/desktop/views/pages/deck/deck.notes.vue index 994e12a04b..54e01a0012 100644 --- a/src/client/app/desktop/views/pages/deck/deck.notes.vue +++ b/src/client/app/desktop/views/pages/deck/deck.notes.vue @@ -18,6 +18,7 @@ :key="note.id" @update:note="onNoteUpdated(i, $event)" :media-view="mediaView" + :compact="true" :mini="true"/> <p class="date" :key="note.id + '_date'" v-if="i != notes.length - 1 && note._date != _notes[i + 1]._date"> <span><fa icon="angle-up"/>{{ note._datetext }}</span> |