From 7b348a00c60c60883be408ca3ba347f6cdf51ad2 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sat, 6 Dec 2014 01:06:31 -0800
Subject: [PATCH] Fix Remove Spoilers stripping tags.

---
 src/General/css/style.css               |  6 ++++++
 src/Miscellaneous/RemoveSpoilers.coffee | 13 ++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/General/css/style.css b/src/General/css/style.css
index 2ee7d0739..9801e788e 100755
--- a/src/General/css/style.css
+++ b/src/General/css/style.css
@@ -918,6 +918,12 @@ span.hide-announcement {
 :root.reveal-spoilers s > a {
   color: white !important;
 }
+:root.reveal-spoilers .removed-spoiler::before {
+  content: "[spoiler]";
+}
+:root.reveal-spoilers .removed-spoiler::after {
+  content: "[/spoiler]";
+}
 
 /* Thread & Reply Hiding */
 .hide-thread-button,
diff --git a/src/Miscellaneous/RemoveSpoilers.coffee b/src/Miscellaneous/RemoveSpoilers.coffee
index f3e0e6cd2..53c1ea0d3 100755
--- a/src/Miscellaneous/RemoveSpoilers.coffee
+++ b/src/Miscellaneous/RemoveSpoilers.coffee
@@ -1,14 +1,10 @@
 RemoveSpoilers =
   init: ->
-    if Conf['Reveal Spoilers'] and !Conf['Remove Spoilers']
+    if Conf['Reveal Spoilers']
       $.addClass doc, 'reveal-spoilers'
 
     return unless Conf['Remove Spoilers']
 
-    if Conf['Reveal Spoilers']
-      @wrapper = (text) ->
-        "[spoiler]#{text}[/spoiler]"
-
     Post.callbacks.push
       name: 'Reveal Spoilers'
       cb:   @node
@@ -16,11 +12,10 @@ RemoveSpoilers =
       name: 'Reveal Spoilers'
       cb:   @node
   
-  wrapper: (text) ->
-    text
-
   node: (post) ->
     spoilers = $$ 's', @nodes.comment
     for spoiler in spoilers
-      $.replace spoiler, $.tn RemoveSpoilers.wrapper spoiler.textContent
+      span = $.el 'span', className: 'removed-spoiler'
+      $.replace spoiler, span
+      $.add span, [spoiler.childNodes...]
     return