aboutsummaryrefslogtreecommitdiff
path: root/src/components/user_avatar/user_avatar.js
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2019-03-25 21:12:15 +0200
committerHenry Jameson <me@hjkos.com>2019-03-25 21:12:15 +0200
commit0ffd43954eb36d61feab7a0a8fb91f86a6857f75 (patch)
tree3f0b597e37613eda5d0840bc7f6e1d33b84cead4 /src/components/user_avatar/user_avatar.js
parent4a5aef8883d3e92a58e272857cdfb303da61feb2 (diff)
parent854d0e80512d2da80cd5153144698a5148da4aa6 (diff)
Merge remote-tracking branch 'upstream/develop' into mastoapi/actions
* upstream/develop: (87 commits) review Update attachment normalizer Add fallback for attachments uploaded via the other platforms Get correct mimetype through entity_normalizer Set default parameter Switch to mastoapi for posting status and uploading media Revert changes prevent text pasting if image is pasted remove border radius of suggested emojis #450 - dispatch login after saved state is loaded #448 - fix timeline fetch error when status text is null #451 - add class to username span No need to fetch mutes on load anymore 🙌 switch to mastoapi switch to mastoapi masto api sends muted property now No need to fetch user data using old api anymore 🎉 Switch to mastoapi reactivity fixes less hackery, more direct usage of mastoapi ...
Diffstat (limited to 'src/components/user_avatar/user_avatar.js')
-rw-r--r--src/components/user_avatar/user_avatar.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/components/user_avatar/user_avatar.js b/src/components/user_avatar/user_avatar.js
index e513b993..e6fed3b5 100644
--- a/src/components/user_avatar/user_avatar.js
+++ b/src/components/user_avatar/user_avatar.js
@@ -23,6 +23,11 @@ const UserAvatar = {
imageLoadError () {
this.showPlaceholder = true
}
+ },
+ watch: {
+ src () {
+ this.showPlaceholder = false
+ }
}
}