diff options
| author | Rinpatch <rinpatch@sdf.org> | 2018-12-13 17:22:19 +0300 |
|---|---|---|
| committer | Rinpatch <rinpatch@sdf.org> | 2018-12-13 17:22:19 +0300 |
| commit | 6de4dcc7c99e14552303e5eee7dac31dd5e58e2e (patch) | |
| tree | 668904f3dba16ab39f683345b2e979e57696db94 /src/components/attachment/attachment.js | |
| parent | 48edc0c8fcc6c63e432c9b6d78f14af086b56900 (diff) | |
| parent | 8e4777ccc6bf72b56a0905ca491c8e0e97fb73cf (diff) | |
Resolve merge conflict
Diffstat (limited to 'src/components/attachment/attachment.js')
| -rw-r--r-- | src/components/attachment/attachment.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js index 41730720..16114c30 100644 --- a/src/components/attachment/attachment.js +++ b/src/components/attachment/attachment.js @@ -13,6 +13,7 @@ const Attachment = { return { nsfwImage, hideNsfwLocal: this.$store.state.config.hideNsfw, + preloadImage: this.$store.state.config.preloadImage, loopVideo: this.$store.state.config.loopVideo, showHidden: false, loading: false, @@ -46,7 +47,7 @@ const Attachment = { } }, toggleHidden () { - if (this.img) { + if (this.img && !this.preloadImage) { if (this.img.onload) { this.img.onload() } else { |