Merge branch 'quotes-hide-card' into 'develop'
oops See merge request pleroma/pleroma-fe!1859
This commit is contained in:
commit
4c11ac9a27
|
@ -0,0 +1 @@
|
||||||
|
fix typo in code that prevented cards from showing at all
|
|
@ -75,7 +75,7 @@ const StatusContent = {
|
||||||
...controlledOrUncontrolledGetters(['showingTall', 'expandingSubject', 'showingLongSubject']),
|
...controlledOrUncontrolledGetters(['showingTall', 'expandingSubject', 'showingLongSubject']),
|
||||||
statusCard () {
|
statusCard () {
|
||||||
if (!this.status.card) return null
|
if (!this.status.card) return null
|
||||||
return this.status.card.url === this.status.quote_url ? null : status.card
|
return this.status.card.url === this.status.quote_url ? null : this.status.card
|
||||||
},
|
},
|
||||||
hideAttachments () {
|
hideAttachments () {
|
||||||
return (this.mergedConfig.hideAttachments && !this.inConversation) ||
|
return (this.mergedConfig.hideAttachments && !this.inConversation) ||
|
||||||
|
|
Loading…
Reference in New Issue