diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-02-04 04:17:11 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-02-04 04:17:11 +0000 |
| commit | d6ee6e8394a86cadc1419f014dc5e77569c62c75 (patch) | |
| tree | 86172bb8f27a7f3a4835e1db431c979bdf088a52 /src/components/still-image | |
| parent | 7115584882f4fde67d248fa61611dbe579a41b9f (diff) | |
| parent | e7f43d6bc3c97f5a98df3e3d6defabe896e7cdce (diff) | |
Merge branch '275-avatar-placeholder' into 'develop'
Support avatar placeholder
Closes #275
See merge request pleroma/pleroma-fe!511
Diffstat (limited to 'src/components/still-image')
| -rw-r--r-- | src/components/still-image/still-image.js | 3 | ||||
| -rw-r--r-- | src/components/still-image/still-image.vue | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/components/still-image/still-image.js b/src/components/still-image/still-image.js index 5ad06dc2..8f3a7206 100644 --- a/src/components/still-image/still-image.js +++ b/src/components/still-image/still-image.js @@ -2,7 +2,8 @@ const StillImage = { props: [ 'src', 'referrerpolicy', - 'mimetype' + 'mimetype', + 'imageLoadError' ], data () { return { diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue index 1dcb7ce6..29c59e42 100644 --- a/src/components/still-image/still-image.vue +++ b/src/components/still-image/still-image.vue @@ -1,7 +1,7 @@ <template> <div class='still-image' :class='{ animated: animated }' > <canvas ref="canvas" v-if="animated"></canvas> - <img ref="src" :src="src" :referrerpolicy="referrerpolicy" v-on:load="onLoad"/> + <img ref="src" :src="src" :referrerpolicy="referrerpolicy" v-on:load="onLoad" @error="imageLoadError"/> </div> </template> |