diff options
| author | Acid Chicken (硫酸鶏) <root@acid-chicken.com> | 2018-12-07 17:21:34 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2018-12-07 17:21:34 +0900 |
| commit | 9f09afc82498dee76ca0b1a71d5fe5502d14bd7a (patch) | |
| tree | 5a5fc4e0b0fde18e04fbccd12bba10dcd999f623 | |
| parent | Add user name conversions (#3534) (diff) | |
| download | misskey-9f09afc82498dee76ca0b1a71d5fe5502d14bd7a.tar.gz misskey-9f09afc82498dee76ca0b1a71d5fe5502d14bd7a.tar.bz2 misskey-9f09afc82498dee76ca0b1a71d5fe5502d14bd7a.zip | |
Fix bug caused by Chrome 71 (#3535)
* Update emoji.vue
* Update autocomplete.vue
* Update emoji.vue
* Update autocomplete.vue
* Update emoji.vue
| -rw-r--r-- | src/client/app/common/views/components/autocomplete.vue | 3 | ||||
| -rw-r--r-- | src/client/app/common/views/components/emoji.vue | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/client/app/common/views/components/autocomplete.vue b/src/client/app/common/views/components/autocomplete.vue index 2d9d700343..1d860ff545 100644 --- a/src/client/app/common/views/components/autocomplete.vue +++ b/src/client/app/common/views/components/autocomplete.vue @@ -44,8 +44,9 @@ const lib = Object.entries(emojilib.lib).filter((x: any) => { }); const char2file = (char: string) => { - let codes = [...char].map(x => x.codePointAt(0).toString(16)); + let codes = Array.from(char).map(x => x.codePointAt(0).toString(16)); if (!codes.includes('200d')) codes = codes.filter(x => x != 'fe0f'); + codes = codes.filter(x => x && x.length); return codes.join('-'); }; diff --git a/src/client/app/common/views/components/emoji.vue b/src/client/app/common/views/components/emoji.vue index 4ea2ea941c..29b09947e4 100644 --- a/src/client/app/common/views/components/emoji.vue +++ b/src/client/app/common/views/components/emoji.vue @@ -66,8 +66,9 @@ export default Vue.extend({ } if (this.char) { - let codes = [...this.char].map(x => x.codePointAt(0).toString(16)); + let codes = Array.from(this.char).map(x => x.codePointAt(0).toString(16)); if (!codes.includes('200d')) codes = codes.filter(x => x != 'fe0f'); + codes = codes.filter(x => x && x.length); this.url = `https://twemoji.maxcdn.com/2/svg/${codes.join('-')}.svg`; } |