From 155da0c6a329d1cb815f43503aca1fb6a56cf4ef Mon Sep 17 00:00:00 2001
From: "Acid Chicken (硫酸鶏)" <root@acid-chicken.com>
Date: Wed, 10 Apr 2019 20:30:00 +0900
Subject: Avoid roma-ji naming

---
 src/client/app/common/views/components/autocomplete.vue | 10 +++++++++-
 src/client/app/common/views/components/menu.vue         | 10 +++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

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

diff --git a/src/client/app/common/views/components/autocomplete.vue b/src/client/app/common/views/components/autocomplete.vue
index b66da49d7f..1aea2f1cb4 100644
--- a/src/client/app/common/views/components/autocomplete.vue
+++ b/src/client/app/common/views/components/autocomplete.vue
@@ -19,7 +19,7 @@
 			<span class="emoji" v-if="emoji.isCustomEmoji"><img :src="emoji.url" :alt="emoji.emoji"/></span>
 			<span class="emoji" v-else-if="!useOsDefaultEmojis"><img :src="emoji.url" :alt="emoji.emoji"/></span>
 			<span class="emoji" v-else>{{ emoji.emoji }}</span>
-			<span class="name" v-html="emoji.name.replace(q, `<b>${q}</b>`)"></span>
+			<span class="name">{{ beforeQ }}<b>{{ q }}</b>{{ afterQ }}</span>
 			<span class="alias" v-if="emoji.aliasOf">({{ emoji.aliasOf }})</span>
 		</li>
 	</ol>
@@ -89,6 +89,14 @@ export default Vue.extend({
 	},
 
 	computed: {
+		beforeQ(): string {
+			return this.emoji.name.split(this.q)[0];
+		},
+
+		afterQ(): string {
+			return this.emoji.name.split(this.q)[1] || '';
+		},
+
 		items(): HTMLCollection {
 			return (this.$refs.suggests as Element).children;
 		},
diff --git a/src/client/app/common/views/components/menu.vue b/src/client/app/common/views/components/menu.vue
index a2124c992d..68fa0f5e62 100644
--- a/src/client/app/common/views/components/menu.vue
+++ b/src/client/app/common/views/components/menu.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="onchrpzrvnoruiaenfcqvccjfuupzzwv" :class="{ isMobile: $root.isMobile }">
 	<div class="backdrop" ref="backdrop" @click="close"></div>
-	<div class="popover" :class="{ hukidasi }" ref="popover">
+	<div class="popover" :class="{ bubble }" ref="popover">
 		<template v-for="item, i in items">
 			<div v-if="item === null"></div>
 			<button v-if="item" @click="clicked(item.action)" :tabindex="i">
@@ -28,7 +28,7 @@ export default Vue.extend({
 	},
 	data() {
 		return {
-			hukidasi: !this.$root.isMobile
+			bubble: !this.$root.isMobile
 		};
 	},
 	mounted() {
@@ -56,12 +56,12 @@ export default Vue.extend({
 
 			if (left + width - window.pageXOffset > window.innerWidth) {
 				left = window.innerWidth - width + window.pageXOffset;
-				this.hukidasi = false;
+				this.bubble = false;
 			}
 
 			if (top + height - window.pageYOffset > window.innerHeight) {
 				top = window.innerHeight - height + window.pageYOffset;
-				this.hukidasi = false;
+				this.bubble = false;
 			}
 
 			if (top < 0) {
@@ -150,7 +150,7 @@ export default Vue.extend({
 
 		$balloon-size = 16px
 
-		&.hukidasi
+		&.bubble
 			margin-top $balloon-size
 			transform-origin center -($balloon-size)
 
-- 
cgit v1.2.3-freya