From a235869cfafe214aa02694e8a8e1f9aae1d69e27 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 6 Dec 2018 11:18:13 +0900
Subject: Refactor

Make mk-user-name component
---
 src/client/app/common/views/components/autocomplete.vue |  2 +-
 src/client/app/common/views/components/index.ts         |  2 ++
 src/client/app/common/views/components/user-name.vue    | 16 ++++++++++++++++
 src/client/app/common/views/pages/follow.vue            |  2 +-
 4 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 src/client/app/common/views/components/user-name.vue

(limited to 'src/client/app/common')

diff --git a/src/client/app/common/views/components/autocomplete.vue b/src/client/app/common/views/components/autocomplete.vue
index af68d8374e..2d9d700343 100644
--- a/src/client/app/common/views/components/autocomplete.vue
+++ b/src/client/app/common/views/components/autocomplete.vue
@@ -4,7 +4,7 @@
 		<li v-for="user in users" @click="complete(type, user)" @keydown="onKeydown" tabindex="-1">
 			<img class="avatar" :src="user.avatarUrl" alt=""/>
 			<span class="name">
-				<misskey-flavored-markdown :text="user.name || user.username" :shouldBreak="false" :plainText="true" :custom-emojis="user.emojis"/>
+				<mk-user-name :user="user"/>
 			</span>
 			<span class="username">@{{ user | acct }}</span>
 		</li>
diff --git a/src/client/app/common/views/components/index.ts b/src/client/app/common/views/components/index.ts
index b8fc7c4096..40d067666a 100644
--- a/src/client/app/common/views/components/index.ts
+++ b/src/client/app/common/views/components/index.ts
@@ -1,5 +1,6 @@
 import Vue from 'vue';
 
+import userName from './user-name.vue';
 import followButton from './follow-button.vue';
 import error from './error.vue';
 import noteSkeleton from './note-skeleton.vue';
@@ -44,6 +45,7 @@ import uiInfo from './ui/info.vue';
 import formButton from './ui/form/button.vue';
 import formRadio from './ui/form/radio.vue';
 
+Vue.component('mk-user-name', userName);
 Vue.component('mk-follow-button', followButton);
 Vue.component('mk-error', error);
 Vue.component('mk-note-skeleton', noteSkeleton);
diff --git a/src/client/app/common/views/components/user-name.vue b/src/client/app/common/views/components/user-name.vue
new file mode 100644
index 0000000000..7719357e38
--- /dev/null
+++ b/src/client/app/common/views/components/user-name.vue
@@ -0,0 +1,16 @@
+<template>
+<misskey-flavored-markdown :text="user.name || user.username" :should-break="false" :plain-text="true" :custom-emojis="user.emojis"/>
+</template>
+
+<script lang="ts">
+import Vue from 'vue';
+
+export default Vue.extend({
+	props: {
+		user: {
+			type: Object,
+			required: true
+		}
+	}
+});
+</script>
diff --git a/src/client/app/common/views/pages/follow.vue b/src/client/app/common/views/pages/follow.vue
index 22f5478d33..854982d91a 100644
--- a/src/client/app/common/views/pages/follow.vue
+++ b/src/client/app/common/views/pages/follow.vue
@@ -7,7 +7,7 @@
 		<mk-avatar class="avatar" :user="user" :disable-preview="true"/>
 		<div class="body">
 			<router-link :to="user | userPage" class="name">
-				<misskey-flavored-markdown :text="user.name || user.username" :shouldBreak="false" :plainText="true" :custom-emojis="user.emojis"/>
+				<mk-user-name :user="user"/>
 			</router-link>
 			<span class="username">@{{ user | acct }}</span>
 			<div class="description">
-- 
cgit v1.2.3-freya