aboutsummaryrefslogtreecommitdiff
path: root/src/components/attachment
diff options
context:
space:
mode:
authorHenry Jameson <me@hjkos.com>2019-10-06 23:28:30 +0300
committerHenry Jameson <me@hjkos.com>2019-10-06 23:28:30 +0300
commit0be86304d24a5f11a64e9120c8ae1ce9121e64e8 (patch)
treea3cf63d86868a80ce1aa3ad2e6cb8cd932885b02 /src/components/attachment
parent20fc259350b6bc9163899b859b496b86cf0083c5 (diff)
Fix tests, more replacing with mergedConfig
Diffstat (limited to 'src/components/attachment')
-rw-r--r--src/components/attachment/attachment.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index e93921fe..21cd0351 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -15,8 +15,8 @@ const Attachment = {
data () {
return {
nsfwImage: this.$store.state.instance.nsfwCensorImage || nsfwImage,
- hideNsfwLocal: this.$store.state.config.hideNsfw,
- preloadImage: this.$store.state.config.preloadImage,
+ hideNsfwLocal: this.$store.getters.mergedConfig.hideNsfw,
+ preloadImage: this.$store.getters.mergedConfig.preloadImage,
loading: false,
img: fileTypeService.fileType(this.attachment.mimetype) === 'image' && document.createElement('img'),
modalOpen: false,
@@ -57,7 +57,7 @@ const Attachment = {
}
},
openModal (event) {
- const modalTypes = this.$store.state.config.playVideosInModal
+ const modalTypes = this.$store.getters.mergedConfig.playVideosInModal
? ['image', 'video']
: ['image']
if (fileTypeService.fileMatchesSomeType(modalTypes, this.attachment) ||
@@ -70,7 +70,7 @@ const Attachment = {
}
},
toggleHidden (event) {
- if (this.$store.state.config.useOneClickNsfw && !this.showHidden) {
+ if (this.$store.getters.mergedConfig.useOneClickNsfw && !this.showHidden) {
this.openModal(event)
return
}