From 139659d42ca0a877843a4fa1606435dd6f6442db Mon Sep 17 00:00:00 2001
From: ValD <maghtpol@gmail.com>
Date: Wed, 12 Dec 2018 03:42:29 +0530
Subject: [PATCH] renamed config to preload images and add ident to config

---
 src/components/attachment/attachment.js  |  2 +-
 src/components/attachment/attachment.vue |  2 +-
 src/components/settings/settings.js      |  6 +++---
 src/components/settings/settings.vue     | 10 ++++++----
 src/i18n/en.json                         |  2 +-
 src/modules/config.js                    |  2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index 71ef2ca4d5..fd9a2057d7 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -13,7 +13,7 @@ const Attachment = {
     return {
       nsfwImage,
       hideNsfwLocal: this.$store.state.config.hideNsfw,
-      preloadNsfwImage: this.$store.state.config.preloadNsfwImage,
+      preloadImage: this.$store.state.config.preloadImage,
       loopVideo: this.$store.state.config.loopVideo,
       showHidden: false,
       loading: false,
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index 1b1956e09b..5eaa0d1dfe 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -9,7 +9,7 @@
     <div class="hider" v-if="nsfw && hideNsfwLocal && !hidden">
       <a href="#" @click.prevent="toggleHidden()">Hide</a>
     </div>
-    <a v-if="type === 'image' && (!hidden || preloadNsfwImage)" class="image-attachment" :class="{'hidden': hidden && preloadNsfwImage}" :href="attachment.url" target="_blank" :title="attachment.description">
+    <a v-if="type === 'image' && (!hidden || preloadImage)" class="image-attachment" :class="{'hidden': hidden && preloadImage}" :href="attachment.url" target="_blank" :title="attachment.description">
       <StillImage :class="{'small': isSmall}" referrerpolicy="no-referrer" :mimetype="attachment.mimetype" :src="attachment.large_thumb_url || attachment.url"/>
     </a>
 
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
index 4d8744dad5..9a658536a8 100644
--- a/src/components/settings/settings.js
+++ b/src/components/settings/settings.js
@@ -14,7 +14,7 @@ const settings = {
       hideAttachmentsInConvLocal: user.hideAttachmentsInConv,
       hideNsfwLocal: user.hideNsfw,
       hideISPLocal: user.hideISP,
-      preloadNsfwImage: user.preloadNsfwImage,
+      preloadImage: user.preloadImage,
       hidePostStatsLocal: typeof user.hidePostStats === 'undefined'
         ? instance.hidePostStats
         : user.hidePostStats,
@@ -85,8 +85,8 @@ const settings = {
     hideNsfwLocal (value) {
       this.$store.dispatch('setOption', { name: 'hideNsfw', value })
     },
-    preloadNsfwImage(value) {
-      this.$store.dispatch('setOption', { name: 'preloadNsfwImage', 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 60b7022713..b98d4c1ad4 100644
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@@ -118,10 +118,12 @@
               <input type="checkbox" id="hideNsfw" v-model="hideNsfwLocal">
               <label for="hideNsfw">{{$t('settings.nsfw_clickthrough')}}</label>
             </li>
-            <li>
-              <input type="checkbox" id="preloadNsfwImage" v-model="preloadNsfwImage">
-              <label for="preloadNsfwImage">{{$t('settings.preload_sensitive')}}</label>
-            </li>
+            <ul class="setting-list suboptions" >
+              <li>
+                <input 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>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index dc47788c92..92429e4b15 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -125,7 +125,7 @@
     "hide_attachments_in_convo": "Hide attachments in conversations",
     "hide_attachments_in_tl": "Hide attachments in timeline",
     "hide_isp": "Hide instance-specific panel",
-    "preload_sensitive": "Preload Sensitive Images",
+    "preload_images": "Preload images",
     "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
     "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
     "import_followers_from_a_csv_file": "Import follows from a csv file",
diff --git a/src/modules/config.js b/src/modules/config.js
index 7b0b2cf4fe..72839476c2 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -9,7 +9,7 @@ const defaultState = {
   hideAttachments: false,
   hideAttachmentsInConv: false,
   hideNsfw: true,
-  preloadNsfwImage: true,
+  preloadImage: true,
   loopVideo: true,
   loopVideoSilentOnly: true,
   autoLoad: true,