rename hidden stuff to virtualHidden, remove log

This commit is contained in:
Shpuld Shpuldson 2020-01-15 16:37:08 +02:00
parent 9eae4d07c1
commit 42f8fb2dca
4 changed files with 11 additions and 12 deletions

View file

@ -46,7 +46,7 @@ const conversation = {
'pinnedStatusIdsObject',
'inProfile',
'profileUserId',
'hidden'
'virtualHidden'
],
created () {
if (this.isPage) {
@ -105,8 +105,8 @@ const conversation = {
isExpanded () {
return this.expanded || this.isPage
},
hiderStyle () {
return this.hidden ? { height: this.height } : {}
hiddenStyle () {
return this.virtualHidden ? { height: this.virtualHeight } : {}
}
},
components: {
@ -127,9 +127,8 @@ const conversation = {
this.fetchConversation()
}
},
hidden (value) {
this.height = `${this.$el.clientHeight}px`
console.log('Element height:', this.height)
virtualHidden (value) {
this.virtualHeight = `${this.$el.clientHeight}px`
}
},
methods: {

View file

@ -1,11 +1,11 @@
<template>
<div
:style="hiderStyle"
:style="hiddenStyle"
class="timeline panel-default"
:class="[isExpanded ? 'panel' : 'panel-disabled']"
>
<div
v-if="isExpanded && !hidden"
v-if="isExpanded && !virtualHidden"
class="panel-heading conversation-heading"
>
<span class="title"> {{ $t('timeline.conversation') }} </span>
@ -29,7 +29,7 @@
:replies="getReplies(status.id)"
:in-profile="inProfile"
:profile-user-id="profileUserId"
:hidden="hidden"
:virtualHidden="virtualHidden"
class="status-fadein panel-body"
@goto="setHighlight"
@toggleExpanded="toggleExpanded"

View file

@ -35,7 +35,7 @@ const Status = {
'showPinned',
'inProfile',
'profileUserId',
'hidden'
'virtualHidden'
],
data () {
return {
@ -122,7 +122,7 @@ const Status = {
return this.mergedConfig.hideFilteredStatuses
},
hideStatus () {
return (this.hideReply || this.deleted) || (this.muted && this.hideFilteredStatuses) || this.hidden
return (this.hideReply || this.deleted) || (this.muted && this.hideFilteredStatuses) || this.virtualHidden
},
isFocused () {
// retweet or root of an expanded conversation

View file

@ -56,7 +56,7 @@
:collapsable="true"
:in-profile="inProfile"
:profile-user-id="userId"
:hidden="!displayingStatuses.includes(status.id)"
:virtualHidden="!displayingStatuses.includes(status.id)"
/>
</template>
</div>