summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2019-09-03 07:25:02 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-09-03 07:25:02 +0900
commitd36b129369ccb67dcba27b2cd3544fdf270abef7 (patch)
tree2def2685ddce8bbeca8dfaeaecb38d9ff97f2592 /src/client
parentFetch more reactins (diff)
downloadsharkey-d36b129369ccb67dcba27b2cd3544fdf270abef7.tar.gz
sharkey-d36b129369ccb67dcba27b2cd3544fdf270abef7.tar.bz2
sharkey-d36b129369ccb67dcba27b2cd3544fdf270abef7.zip
Improve reaction tooltip
Diffstat (limited to 'src/client')
-rw-r--r--src/client/app/common/views/components/reactions-viewer.details.vue6
-rw-r--r--src/client/app/common/views/components/reactions-viewer.reaction.vue6
2 files changed, 9 insertions, 3 deletions
diff --git a/src/client/app/common/views/components/reactions-viewer.details.vue b/src/client/app/common/views/components/reactions-viewer.details.vue
index efe7eb39ba..35c648278d 100644
--- a/src/client/app/common/views/components/reactions-viewer.details.vue
+++ b/src/client/app/common/views/components/reactions-viewer.details.vue
@@ -12,7 +12,7 @@
</i18n>
<i18n path="many-users" v-if="10 < users.length">
<span slot="users">{{ users.slice(0, 10).join(', ') }}</span>
- <span slot="ommited">{{ users.length - 10 }}</span>
+ <span slot="ommited">{{ count - 10 }}</span>
<mk-reaction-icon slot="reaction" :reaction="reaction" ref="icon" />
</i18n>
</div>
@@ -34,6 +34,10 @@ export default Vue.extend({
type: Array,
required: true,
},
+ count: {
+ type: Number,
+ required: true,
+ },
source: {
required: true,
}
diff --git a/src/client/app/common/views/components/reactions-viewer.reaction.vue b/src/client/app/common/views/components/reactions-viewer.reaction.vue
index c06430e5eb..dade012c29 100644
--- a/src/client/app/common/views/components/reactions-viewer.reaction.vue
+++ b/src/client/app/common/views/components/reactions-viewer.reaction.vue
@@ -102,9 +102,10 @@ export default Vue.extend({
if (this.$root.isMobile) return;
this.$root.api('notes/reactions', {
noteId: this.note.id,
- limit: 30
+ type: this.reaction,
+ limit: 11
}).then((reactions: any[]) => {
- const users = reactions.filter(x => x.type === this.reaction)
+ const users = reactions
.sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime())
.map(x => x.user);
@@ -113,6 +114,7 @@ export default Vue.extend({
this.details = this.$root.new(XDetails, {
reaction: this.reaction,
users,
+ count: this.count,
source: this.$refs.reaction
});
});