diff options
| author | HJ <spam@hjkos.com> | 2018-12-12 19:01:53 +0000 |
|---|---|---|
| committer | HJ <spam@hjkos.com> | 2018-12-12 19:01:53 +0000 |
| commit | 7325ff2e7adeeed9abd8f8f2876985d7702053ee (patch) | |
| tree | 4126e63e2b21d1cf3252c36a8ac83c9aa0fc0bcb /src/components/settings | |
| parent | f0fb6e6015f1cf472433f641a76a428f5a48a20f (diff) | |
| parent | b271957b4cbee7a489acccbdc84f19d3d6414412 (diff) | |
Merge branch 'dev_vald_fe/nsfw_preload' into 'develop'
preload nsfw image
Closes #193
See merge request pleroma/pleroma-fe!411
Diffstat (limited to 'src/components/settings')
| -rw-r--r-- | src/components/settings/settings.js | 4 | ||||
| -rw-r--r-- | src/components/settings/settings.vue | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js index 19bd2e5b..c9e12708 100644 --- a/src/components/settings/settings.js +++ b/src/components/settings/settings.js @@ -14,6 +14,7 @@ const settings = { hideAttachmentsInConvLocal: user.hideAttachmentsInConv, hideNsfwLocal: user.hideNsfw, hideISPLocal: user.hideISP, + preloadImage: user.preloadImage, hidePostStatsLocal: typeof user.hidePostStats === 'undefined' ? instance.hidePostStats : user.hidePostStats, @@ -84,6 +85,9 @@ const settings = { hideNsfwLocal (value) { this.$store.dispatch('setOption', { name: 'hideNsfw', value }) }, + preloadImage (value) { + this.$store.dispatch('setOption', { name: 'preloadImage', value }) + }, hideISPLocal (value) { this.$store.dispatch('setOption', { name: 'hideISP', value }) }, diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index dec33505..6cdc82da 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -118,6 +118,12 @@ <input type="checkbox" id="hideNsfw" v-model="hideNsfwLocal"> <label for="hideNsfw">{{$t('settings.nsfw_clickthrough')}}</label> </li> + <ul class="setting-list suboptions" > + <li> + <input :disabled="!hideAttachmentsInConvLocal" type="checkbox" id="preloadImage" v-model="preloadImage"> + <label for="preloadImage">{{$t('settings.preload_images')}}</label> + </li> + </ul> <li> <input type="checkbox" id="stopGifs" v-model="stopGifs"> <label for="stopGifs">{{$t('settings.stop_gifs')}}</label> |