diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2019-10-14 01:41:25 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-10-14 01:41:25 +0900 |
| commit | da696505056e20320e25fcc21c939f10370b8e71 (patch) | |
| tree | a79ba79116e7f04f07aa6e164af971d1003c7994 /src/client/app | |
| parent | 閉じずに残ってしまうメニューなどの修正 (#5496) (diff) | |
| download | sharkey-da696505056e20320e25fcc21c939f10370b8e71.tar.gz sharkey-da696505056e20320e25fcc21c939f10370b8e71.tar.bz2 sharkey-da696505056e20320e25fcc21c939f10370b8e71.zip | |
Resolve #5500
Diffstat (limited to 'src/client/app')
| -rw-r--r-- | src/client/app/common/views/components/reaction-picker.vue | 11 | ||||
| -rw-r--r-- | src/client/app/common/views/components/settings/settings.vue | 12 | ||||
| -rw-r--r-- | src/client/app/store.ts | 1 |
3 files changed, 14 insertions, 10 deletions
diff --git a/src/client/app/common/views/components/reaction-picker.vue b/src/client/app/common/views/components/reaction-picker.vue index ff534d37ce..17a92c72e3 100644 --- a/src/client/app/common/views/components/reaction-picker.vue +++ b/src/client/app/common/views/components/reaction-picker.vue @@ -4,16 +4,7 @@ <div class="popover" :class="{ isMobile: $root.isMobile }" ref="popover"> <p v-if="!$root.isMobile">{{ title }}</p> <div class="buttons" ref="buttons" :class="{ showFocus }"> - <button @click="react('like')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="1" :title="$t('@.reactions.like')" v-particle><mk-reaction-icon reaction="like"/></button> - <button @click="react('love')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="2" :title="$t('@.reactions.love')" v-particle><mk-reaction-icon reaction="love"/></button> - <button @click="react('laugh')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="3" :title="$t('@.reactions.laugh')" v-particle><mk-reaction-icon reaction="laugh"/></button> - <button @click="react('hmm')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="4" :title="$t('@.reactions.hmm')" v-particle><mk-reaction-icon reaction="hmm"/></button> - <button @click="react('surprise')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="5" :title="$t('@.reactions.surprise')" v-particle><mk-reaction-icon reaction="surprise"/></button> - <button @click="react('congrats')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="6" :title="$t('@.reactions.congrats')" v-particle><mk-reaction-icon reaction="congrats"/></button> - <button @click="react('angry')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="7" :title="$t('@.reactions.angry')" v-particle><mk-reaction-icon reaction="angry"/></button> - <button @click="react('confused')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="8" :title="$t('@.reactions.confused')" v-particle><mk-reaction-icon reaction="confused"/></button> - <button @click="react('rip')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="9" :title="$t('@.reactions.rip')" v-particle><mk-reaction-icon reaction="rip"/></button> - <button @click="react('pudding')" @mouseover="onMouseover" @mouseout="onMouseout" tabindex="10" :title="$t('@.reactions.pudding')" v-particle><mk-reaction-icon reaction="pudding"/></button> + <button v-for="(reaction, i) in $store.state.settings.reactions" :key="reaction" @click="react(reaction)" @mouseover="onMouseover" @mouseout="onMouseout" :tabindex="i + 1" :title="/^[a-z]+$/.test(reaction) ? $t('@.reactions.' + reaction) : reaction" v-particle><mk-reaction-icon :reaction="reaction"/></button> </div> <div v-if="enableEmojiReaction" class="text"> <input v-model="text" :placeholder="$t('input-reaction-placeholder')" @keyup.enter="reactText" @input="tryReactText" v-autocomplete="{ model: 'text' }"> diff --git a/src/client/app/common/views/components/settings/settings.vue b/src/client/app/common/views/components/settings/settings.vue index 914d5bf84f..6ea1147c54 100644 --- a/src/client/app/common/views/components/settings/settings.vue +++ b/src/client/app/common/views/components/settings/settings.vue @@ -109,6 +109,13 @@ </section> <section> + <header>{{ $t('@._settings.reactions') }}</header> + <ui-textarea v-model="reactions"> + {{ $t('@._settings.reactions') }}<template #desc>{{ $t('@._settings.reactions-description') }}</template> + </ui-textarea> + </section> + + <section> <header>{{ $t('@._settings.timeline') }}</header> <ui-switch v-model="showMyRenotes">{{ $t('@._settings.show-my-renotes') }}</ui-switch> <ui-switch v-model="showRenotedMyNotes">{{ $t('@._settings.show-renoted-my-notes') }}</ui-switch> @@ -407,6 +414,11 @@ export default Vue.extend({ set(value) { this.$store.dispatch('settings/set', { key: 'disableViaMobile', value }); } }, + reactions: { + get() { return this.$store.state.settings.reactions.join('\n'); }, + set(value: string) { this.$store.dispatch('settings/set', { key: 'reactions', value: value.split('\n') }); } + }, + useShadow: { get() { return this.$store.state.device.useShadow; }, set(value) { this.$store.commit('device/set', { key: 'useShadow', value }); } diff --git a/src/client/app/store.ts b/src/client/app/store.ts index 92fb1568b0..f4ec9e501a 100644 --- a/src/client/app/store.ts +++ b/src/client/app/store.ts @@ -41,6 +41,7 @@ const defaultSettings = { uploadFolder: null, pastedFileName: 'yyyy-MM-dd HH-mm-ss [{{number}}]', pasteDialog: false, + reactions: ['like', 'love', 'laugh', 'hmm', 'surprise', 'congrats', 'angry', 'confused', 'rip', 'pudding'] }; const defaultDeviceSettings = { |