From 6e608dd2dd5a9d28c384b7fb368e76c477685ffd Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Fri, 2 Dec 2016 14:22:42 +0100
Subject: Add re-hiding of nsfw images.

---
 src/components/attachment/attachment.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/components/attachment/attachment.js')

diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index 9f751863..22324922 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -7,17 +7,23 @@ const Attachment = {
     'nsfw',
     'statusId'
   ],
-  data: () => ({ nsfwImage }),
+  data: () => ({
+    nsfwImage,
+    showHidden: false
+  }),
   computed: {
     type () {
       return fileTypeService.fileType(this.attachment.mimetype)
+    },
+    hidden () {
+      return this.nsfw && !this.showHidden
     }
   },
   methods: {
-    showNsfw () {
-      this.$store.commit('setNsfw', { id: this.statusId, nsfw: false })
+    toggleHidden () {
+      this.showHidden = !this.showHidden
     }
   }
 }
 
-export default Attachment
\ No newline at end of file
+export default Attachment
-- 
cgit v1.2.3-70-g09d2


From 01951d12518b0e3c62d26cc82dc79a4989d970e5 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Fri, 2 Dec 2016 14:42:01 +0100
Subject: Rename nsfw image.

---
 src/assets/nsfw.jpg                     | Bin 18315 -> 0 bytes
 src/assets/nsfw.png                     | Bin 0 -> 18166 bytes
 src/components/attachment/attachment.js |   2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 src/assets/nsfw.jpg
 create mode 100644 src/assets/nsfw.png

(limited to 'src/components/attachment/attachment.js')

diff --git a/src/assets/nsfw.jpg b/src/assets/nsfw.jpg
deleted file mode 100644
index 6ae4ffe9..00000000
Binary files a/src/assets/nsfw.jpg and /dev/null differ
diff --git a/src/assets/nsfw.png b/src/assets/nsfw.png
new file mode 100644
index 00000000..bb6556b4
Binary files /dev/null and b/src/assets/nsfw.png differ
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index 22324922..c88497a2 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -1,4 +1,4 @@
-import nsfwImage from '../../assets/nsfw.jpg'
+import nsfwImage from '../../assets/nsfw.png'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 
 const Attachment = {
-- 
cgit v1.2.3-70-g09d2