summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-06-10 23:11:22 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-06-10 23:11:22 +0900
commit2eb02ae5816f671b8c97d36da59422fa6e3aa87f (patch)
treed2cc42d09942f290e97274ceced7c1ee47e1424a
parentMerge branch 'develop' (diff)
parent11.20.3 (diff)
downloadmisskey-2eb02ae5816f671b8c97d36da59422fa6e3aa87f.tar.gz
misskey-2eb02ae5816f671b8c97d36da59422fa6e3aa87f.tar.bz2
misskey-2eb02ae5816f671b8c97d36da59422fa6e3aa87f.zip
Merge branch 'develop'
-rw-r--r--CHANGELOG.md5
-rw-r--r--package.json2
-rw-r--r--src/client/app/common/views/components/autocomplete.vue10
3 files changed, 7 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9ce55c124..e8511132b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,11 @@ npm i -g ts-node
npm run migrate
```
+11.20.3 (2019/06/10)
+--------------------
+### 🐛Fixes
+* 絵文字サジェストが動作しなくなっていた問題を修正
+
11.20.2 (2019/06/10)
--------------------
### 🐛Fixes
diff --git a/package.json b/package.json
index bc1ee7beb3..b779b4ec9c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "misskey",
"author": "syuilo <i@syuilo.com>",
- "version": "11.20.2",
+ "version": "11.20.3",
"codename": "daybreak",
"repository": {
"type": "git",
diff --git a/src/client/app/common/views/components/autocomplete.vue b/src/client/app/common/views/components/autocomplete.vue
index 1aea2f1cb4..b66da49d7f 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">{{ beforeQ }}<b>{{ q }}</b>{{ afterQ }}</span>
+ <span class="name" v-html="emoji.name.replace(q, `<b>${q}</b>`)"></span>
<span class="alias" v-if="emoji.aliasOf">({{ emoji.aliasOf }})</span>
</li>
</ol>
@@ -89,14 +89,6 @@ 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;
},