From 5fb4538315eca7b22ad326ac60c4ebd6a53b20f3 Mon Sep 17 00:00:00 2001 From: syuilo <Syuilotan@yahoo.co.jp> Date: Sat, 16 Oct 2021 01:28:34 +0900 Subject: [PATCH] =?UTF-8?q?refactor(client):=20=E3=82=B3=E3=83=B3=E3=83=9D?= =?UTF-8?q?=E3=83=BC=E3=83=8D=E3=83=B3=E3=83=88=E5=90=8D=E3=81=8C=E7=B4=9B?= =?UTF-8?q?=E3=82=89=E3=82=8F=E3=81=97=E3=81=8F=E3=81=AA=E3=82=8B=E3=81=AE?= =?UTF-8?q?=E3=81=A7preview->simple=E3=81=AB=E3=83=AA=E3=83=8D=E3=83=BC?= =?UTF-8?q?=E3=83=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/components/note-detailed.vue | 6 +++--- .../components/{note-preview.vue => note-simple.vue} | 0 src/client/components/note.vue | 6 +++--- src/client/components/post-form.vue | 10 +++++----- src/client/ui/chat/note.vue | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) rename src/client/components/{note-preview.vue => note-simple.vue} (100%) diff --git a/src/client/components/note-detailed.vue b/src/client/components/note-detailed.vue index 68e7c87f2e..40b0a68c58 100644 --- a/src/client/components/note-detailed.vue +++ b/src/client/components/note-detailed.vue @@ -80,7 +80,7 @@ </div> <XPoll v-if="appearNote.poll" :note="appearNote" ref="pollViewer" class="poll"/> <MkUrlPreview v-for="url in urls" :url="url" :key="url" :compact="true" :detail="true" class="url-preview"/> - <div class="renote" v-if="appearNote.renote"><XNotePreview :note="appearNote.renote"/></div> + <div class="renote" v-if="appearNote.renote"><XNoteSimple :note="appearNote.renote"/></div> </div> <MkA v-if="appearNote.channel && !inChannel" class="channel" :to="`/channels/${appearNote.channel.id}`"><i class="fas fa-satellite-dish"></i> {{ appearNote.channel.name }}</MkA> </div> @@ -132,7 +132,7 @@ import * as mfm from 'mfm-js'; import { sum } from '../../prelude/array'; import XSub from './note.sub.vue'; import XNoteHeader from './note-header.vue'; -import XNotePreview from './note-preview.vue'; +import XNoteSimple from './note-simple.vue'; import XReactionsViewer from './reactions-viewer.vue'; import XMediaList from './media-list.vue'; import XCwButton from './cw-button.vue'; @@ -153,7 +153,7 @@ export default defineComponent({ components: { XSub, XNoteHeader, - XNotePreview, + XNoteSimple, XReactionsViewer, XMediaList, XCwButton, diff --git a/src/client/components/note-preview.vue b/src/client/components/note-simple.vue similarity index 100% rename from src/client/components/note-preview.vue rename to src/client/components/note-simple.vue diff --git a/src/client/components/note.vue b/src/client/components/note.vue index 3b07884cee..91a3e3b87d 100644 --- a/src/client/components/note.vue +++ b/src/client/components/note.vue @@ -64,7 +64,7 @@ </div> <XPoll v-if="appearNote.poll" :note="appearNote" ref="pollViewer" class="poll"/> <MkUrlPreview v-for="url in urls" :url="url" :key="url" :compact="true" :detail="false" class="url-preview"/> - <div class="renote" v-if="appearNote.renote"><XNotePreview :note="appearNote.renote"/></div> + <div class="renote" v-if="appearNote.renote"><XNoteSimple :note="appearNote.renote"/></div> <button v-if="collapsed" class="fade _button" @click="collapsed = false"> <span>{{ $ts.showMore }}</span> </button> @@ -114,7 +114,7 @@ import * as mfm from 'mfm-js'; import { sum } from '../../prelude/array'; import XSub from './note.sub.vue'; import XNoteHeader from './note-header.vue'; -import XNotePreview from './note-preview.vue'; +import XNoteSimple from './note-simple.vue'; import XReactionsViewer from './reactions-viewer.vue'; import XMediaList from './media-list.vue'; import XCwButton from './cw-button.vue'; @@ -134,7 +134,7 @@ export default defineComponent({ components: { XSub, XNoteHeader, - XNotePreview, + XNoteSimple, XReactionsViewer, XMediaList, XCwButton, diff --git a/src/client/components/post-form.vue b/src/client/components/post-form.vue index 85117b074e..3b8db21099 100644 --- a/src/client/components/post-form.vue +++ b/src/client/components/post-form.vue @@ -22,8 +22,8 @@ </div> </header> <div class="form" :class="{ fixed }"> - <XNotePreview class="preview" v-if="reply" :note="reply"/> - <XNotePreview class="preview" v-if="renote" :note="renote"/> + <XNoteSimple class="preview" v-if="reply" :note="reply"/> + <XNoteSimple class="preview" v-if="renote" :note="renote"/> <div class="with-quote" v-if="quoteId"><i class="fas fa-quote-left"></i> {{ $ts.quoteAttached }}<button @click="quoteId = null"><i class="fas fa-times"></i></button></div> <div v-if="visibility === 'specified'" class="to-specified"> <span style="margin-right: 8px;">{{ $ts.recipient }}</span> @@ -41,7 +41,7 @@ <input v-show="withHashtags" ref="hashtags" class="hashtags" v-model="hashtags" :placeholder="$ts.hashtags" list="hashtags"> <XPostFormAttaches class="attaches" :files="files" @updated="updateFiles" @detach="detachFile" @changeSensitive="updateFileSensitive" @changeName="updateFileName"/> <XPollEditor v-if="poll" :poll="poll" @destroyed="poll = null" @updated="onPollUpdate"/> - <XNotePreview class="preview" v-if="showPreview" :note="draftedNote"/> + <XNoteSimple class="preview" v-if="showPreview" :note="draftedNote"/> <footer> <button class="_button" @click="chooseFileFrom" v-tooltip="$ts.attachFile"><i class="fas fa-photo-video"></i></button> <button class="_button" @click="togglePoll" :class="{ active: poll }" v-tooltip="$ts.poll"><i class="fas fa-poll-h"></i></button> @@ -63,7 +63,7 @@ import { defineComponent, defineAsyncComponent } from 'vue'; import insertTextAtCursor from 'insert-text-at-cursor'; import { length } from 'stringz'; import { toASCII } from 'punycode/'; -import XNotePreview from './note-preview.vue'; +import XNoteSimple from './note-simple.vue'; import * as mfm from 'mfm-js'; import { host, url } from '@client/config'; import { erase, unique } from '../../prelude/array'; @@ -82,7 +82,7 @@ import { defaultStore } from '@client/store'; export default defineComponent({ components: { - XNotePreview, + XNoteSimple, XPostFormAttaches: defineAsyncComponent(() => import('./post-form-attaches.vue')), XPollEditor: defineAsyncComponent(() => import('./poll-editor.vue')), MkInfo, diff --git a/src/client/ui/chat/note.vue b/src/client/ui/chat/note.vue index c376887b84..0a054d1057 100644 --- a/src/client/ui/chat/note.vue +++ b/src/client/ui/chat/note.vue @@ -56,7 +56,7 @@ </div> <XPoll v-if="appearNote.poll" :note="appearNote" ref="pollViewer" class="poll"/> <MkUrlPreview v-for="url in urls" :url="url" :key="url" :compact="true" :detail="false" class="url-preview"/> - <div class="renote" v-if="appearNote.renote"><XNotePreview :note="appearNote.renote"/></div> + <div class="renote" v-if="appearNote.renote"><XNoteSimple :note="appearNote.renote"/></div> <button v-if="collapsed" class="fade _button" @click="collapsed = false"> <span>{{ $ts.showMore }}</span> </button> @@ -106,7 +106,7 @@ import * as mfm from 'mfm-js'; import { sum } from '../../../prelude/array'; import XSub from './note.sub.vue'; import XNoteHeader from './note-header.vue'; -import XNotePreview from './note-preview.vue'; +import XNoteSimple from './note-preview.vue'; import XReactionsViewer from '@client/components/reactions-viewer.vue'; import XMediaList from '@client/components/media-list.vue'; import XCwButton from '@client/components/cw-button.vue'; @@ -126,7 +126,7 @@ export default defineComponent({ components: { XSub, XNoteHeader, - XNotePreview, + XNoteSimple, XReactionsViewer, XMediaList, XCwButton,