summaryrefslogtreecommitdiff
path: root/src/client/app/common/views/components
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-09-18 12:42:56 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-09-18 12:42:56 +0900
commit71a93b2b435a1747a710a593588c1daec8ef7878 (patch)
tree2aed281df14fe7c019441dc324a421b1db6e5634 /src/client/app/common/views/components
parentリファクタリングなど (diff)
downloadmisskey-71a93b2b435a1747a710a593588c1daec8ef7878.tar.gz
misskey-71a93b2b435a1747a710a593588c1daec8ef7878.tar.bz2
misskey-71a93b2b435a1747a710a593588c1daec8ef7878.zip
Refactor & Usability improvements
Diffstat (limited to 'src/client/app/common/views/components')
-rw-r--r--src/client/app/common/views/components/reaction-picker.vue18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/client/app/common/views/components/reaction-picker.vue b/src/client/app/common/views/components/reaction-picker.vue
index 811f82283d..ce0d2a8ea3 100644
--- a/src/client/app/common/views/components/reaction-picker.vue
+++ b/src/client/app/common/views/components/reaction-picker.vue
@@ -56,6 +56,12 @@ export default Vue.extend({
type: Boolean,
required: false,
default: false
+ },
+
+ animation: {
+ type: Boolean,
+ required: false,
+ default: true
}
},
@@ -70,9 +76,7 @@ export default Vue.extend({
keymap(): any {
return {
'esc': this.close,
- 'enter': this.choose,
- 'space': this.choose,
- 'plus': this.choose,
+ 'enter|space|plus': this.choose,
'up': this.focusUp,
'right': this.focusRight,
'down': this.focusDown,
@@ -126,7 +130,7 @@ export default Vue.extend({
anime({
targets: this.$refs.backdrop,
opacity: 1,
- duration: 100,
+ duration: this.animation ? 100 : 0,
easing: 'linear'
});
@@ -134,7 +138,7 @@ export default Vue.extend({
targets: this.$refs.popover,
opacity: 1,
scale: [0.5, 1],
- duration: 500
+ duration: this.animation ? 500 : 0
});
});
},
@@ -164,7 +168,7 @@ export default Vue.extend({
anime({
targets: this.$refs.backdrop,
opacity: 0,
- duration: 200,
+ duration: this.animation ? 200 : 0,
easing: 'linear'
});
@@ -173,7 +177,7 @@ export default Vue.extend({
targets: this.$refs.popover,
opacity: 0,
scale: 0.5,
- duration: 200,
+ duration: this.animation ? 200 : 0,
easing: 'easeInBack',
complete: () => {
this.$emit('closed');