From 66b59f2752e47a9f6349810c8de6d2947d811de0 Mon Sep 17 00:00:00 2001 From: wakarimasen Date: Tue, 11 Apr 2017 11:47:19 +0200 Subject: [PATCH 01/18] Fix daily average on accounts younger than a day --- src/components/user_card_content/user_card_content.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue index 8c971d537c..7b89a7f24e 100644 --- a/src/components/user_card_content/user_card_content.vue +++ b/src/components/user_card_content/user_card_content.vue @@ -79,9 +79,8 @@ return this.$store.state.users.currentUser }, dailyAvg () { - return Math.round( - this.user.statuses_count / ((new Date() - new Date(this.user.created_at)) / (60 * 60 * 24 * 1000)) - ) + const days = Math.ceil((new Date() - new Date(this.user.created_at)) / (60 * 60 * 24 * 1000)) + return Math.round(this.user.statuses_count / days) } }, methods: { From a675cfbb3ebd9c4c093a4535cc5cd0e672a45500 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Wed, 12 Apr 2017 18:25:19 +0300 Subject: [PATCH 02/18] Goto-original-arrow button now sets conversation highlight/focus even when inline, setting focus now scrolls you to the focused post smoothly. Hide the arrow button when not expanded. --- src/components/conversation/conversation.js | 8 +++++ src/components/conversation/conversation.vue | 2 +- src/components/status/status.js | 36 +++++++++++++++++++- src/components/status/status.vue | 12 +++---- 4 files changed, 49 insertions(+), 9 deletions(-) diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index 281b0183c6..fa042d2395 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -8,6 +8,11 @@ const sortAndFilterConversation = (conversation) => { } const conversation = { + data() { + return { + highlight: this.statusoid.id + } + }, props: [ 'statusoid', 'collapsable' @@ -54,6 +59,9 @@ const conversation = { } else { return (id === this.statusoid.id) } + }, + setHighlight(id) { + this.highlight = id } } } diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 726cfb65e0..8b1e00ac05 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -8,7 +8,7 @@
- +
diff --git a/src/components/status/status.js b/src/components/status/status.js index bb026fe1f6..b06bc08d87 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -11,7 +11,8 @@ const Status = { 'statusoid', 'expandable', 'inConversation', - 'focused' + 'focused', + 'highlight' ], data: () => ({ replying: false, @@ -53,6 +54,15 @@ const Status = { return { borderBottomColor: this.$store.state.config.colors['base02'] } + }, + isFocused () { + // retweet or root of an expanded conversation + if(this.focused) + return true + // use conversation highlight only when in conversation + else if(!this.inConversation) + return false + return this.highlight == this.status.id } }, components: { @@ -75,6 +85,10 @@ const Status = { toggleReplying () { this.replying = !this.replying }, + gotoOriginal () { + // only handled by conversation, not status_or_conversation + this.$emit('goto', this.status.in_reply_to_status_id) + }, toggleExpanded () { this.$emit('toggleExpanded') }, @@ -84,6 +98,26 @@ const Status = { toggleUserExpanded () { this.userExpanded = !this.userExpanded } + }, + watch: { + 'highlight': function (newfocus) { + if(this.status.id == newfocus) { + let rect = this.$el.getBoundingClientRect() + if(rect.top < 100) + window.scrollBy({ + left: 0, + top: rect.top - 200, + behavior: 'smooth' + }) + // will be useful when scrolling down to replies or root posts is in + else if(rect.bottom > window.innerHeight - 100) + window.scrollBy({ + left: 0, + top: rect.bottom + 200, + behavior: 'smooth' + }) + } + } } } diff --git a/src/components/status/status.vue b/src/components/status/status.vue index b471888a2c..db33a200c4 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -1,5 +1,5 @@