diff options
| author | lambda <pleromagit@rogerbraun.net> | 2019-01-28 10:52:24 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2019-01-28 10:52:24 +0000 |
| commit | 3b1cafc19fc8f094bb2469f194afab5b5464cecb (patch) | |
| tree | 055a8978d39f87c4824af74a66e38ab880badf70 /src/components | |
| parent | 2585dfa4c2176389be8823206f7e4eac12633528 (diff) | |
| parent | 20f113e811bbc87e875a91b1828e2435bdc7751b (diff) | |
Merge branch 'fix/fix-warnings' into 'develop'
Fix annoying console warnings
See merge request pleroma/pleroma-fe!480
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/status/status.js | 2 | ||||
| -rw-r--r-- | src/components/user_profile/user_profile.vue | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/components/status/status.js b/src/components/status/status.js index b14a74ec..13e79dd0 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -125,7 +125,7 @@ const Status = { return lengthScore > 20 }, isReply () { - return !!this.status.in_reply_to_status_id + return !!(this.status.in_reply_to_status_id && this.status.in_reply_to_user_id) }, replyToName () { const user = this.$store.state.users.usersObject[this.status.in_reply_to_user_id] diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index 74cd9c53..f9b964ce 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -20,8 +20,8 @@ <i class="icon-spin3 animate-spin"></i> </div> </div> - <Timeline :label="$t('user_card.media')" :embedded="true" :title="$t('user_profile.media_title')" timeline-name="media" :timeline="media" :user-id="fetchBy" /> - <Timeline v-if="isUs" :label="$t('user_card.favorites')" :embedded="true" :title="$t('user_profile.favorites_title')" timeline-name="favorites" :timeline="favorites"/> + <Timeline :label="$t('user_card.media')" :embedded="true" :title="$t('user_card.media')" timeline-name="media" :timeline="media" :user-id="fetchBy" /> + <Timeline v-if="isUs" :label="$t('user_card.favorites')" :embedded="true" :title="$t('user_card.favorites')" timeline-name="favorites" :timeline="favorites"/> </tab-switcher> </div> <div v-else class="panel user-profile-placeholder"> |