summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2020-02-27 07:04:28 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2020-02-27 07:04:28 +0900
commit969cd16638698a19dc707c01b48270871b5e2f6d (patch)
tree74c65e53410c84fb86c8cbad8b6427b9ba5d2a27 /src
parent同じホットキーが連続で発動しないように (#6082) (diff)
downloadsharkey-969cd16638698a19dc707c01b48270871b5e2f6d.tar.gz
sharkey-969cd16638698a19dc707c01b48270871b5e2f6d.tar.bz2
sharkey-969cd16638698a19dc707c01b48270871b5e2f6d.zip
Resolve #6091
Diffstat (limited to 'src')
-rw-r--r--src/client/pages/my-settings/reaction.vue13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/client/pages/my-settings/reaction.vue b/src/client/pages/my-settings/reaction.vue
index 7ce39380fd..b2df3f0231 100644
--- a/src/client/pages/my-settings/reaction.vue
+++ b/src/client/pages/my-settings/reaction.vue
@@ -3,13 +3,13 @@
<div class="_title"><fa :icon="faLaugh"/> {{ $t('reaction') }}</div>
<div class="_content">
<mk-input v-model="reactions" style="font-family: 'Segoe UI Emoji', 'Noto Color Emoji', Roboto, HelveticaNeue, Arial, sans-serif">
- {{ $t('reaction') }}<template #desc>{{ $t('reactionSettingDescription') }}</template>
+ {{ $t('reaction') }}<template #desc>{{ $t('reactionSettingDescription') }} <button class="_textButton" @click="chooseEmoji">{{ $t('chooseEmoji') }}</button></template>
</mk-input>
+ <mk-button inline @click="setDefault"><fa :icon="faUndo"/> {{ $t('default') }}</mk-button>
</div>
<div class="_footer">
<mk-button @click="save()" primary inline :disabled="!changed"><fa :icon="faSave"/> {{ $t('save') }}</mk-button>
<mk-button inline @click="preview"><fa :icon="faEye"/> {{ $t('preview') }}</mk-button>
- <mk-button inline @click="setDefault"><fa :icon="faUndo"/> {{ $t('default') }}</mk-button>
</div>
</section>
</template>
@@ -72,6 +72,15 @@ export default Vue.extend({
setDefault() {
this.reactions = '👍❤😆🤔😮🎉💢😥😇🍮';
},
+
+ async chooseEmoji(ev) {
+ const vm = this.$root.new(await import('../../components/emoji-picker.vue').then(m => m.default), {
+ source: ev.currentTarget || ev.target
+ }).$once('chosen', emoji => {
+ this.reactions += emoji;
+ vm.close();
+ });
+ }
}
});
</script>