white-space pre-wrap for real

4 files changed, 6 insertions, 4 deletions

diff --git a/public/assets/css/bucky.css b/public/assets/css/bucky.css
index 2482b46..1dadaf0 100644
--- a/public/assets/css/bucky.css
+++ b/public/assets/css/bucky.css
@@ -393,13 +393,15 @@ tr:nth-child(even) td.black       { background-color: #eee; border-bottom-color:
   color: #111111;
 }
 .comment .body {
-  white-space: pre-wrap;
   font-size: 12px;
   line-height: 1.3;
   width: 100%;
   padding-bottom: 3px;
   margin-right: 110px;
 }
+.contents {
+  white-space: pre-wrap;
+}
 .comment .date {
   position: absolute;
   bottom: 12px;
diff --git a/public/assets/js/util/format.js b/public/assets/js/util/format.js
index 5002899..1e6025b 100644
--- a/public/assets/js/util/format.js
+++ b/public/assets/js/util/format.js
@@ -200,7 +200,7 @@ function tidy_urls (s, short_urls) {
       }
     });
 
-  }).join("<br>\n")
+  }).join("\n")
   return ret
 }
 function get_domain(url){
diff --git a/views/pages/message.ejs b/views/pages/message.ejs
index 6a81d46..f6399e7 100644
--- a/views/pages/message.ejs
+++ b/views/pages/message.ejs
@@ -21,7 +21,7 @@
       <a href='#' class='discard_link'>discard</a>
     </span>
     <div class="body">
-      {{body}}
+      <span class="contents">{{body}}</span>
     </div>
   </script>
 </div>
diff --git a/views/partials/comments.ejs b/views/partials/comments.ejs
index b47702c..50abe6e 100644
--- a/views/partials/comments.ejs
+++ b/views/partials/comments.ejs
@@ -7,7 +7,7 @@
       </td>
       <td colspan="2" class="comment">
         <div class="body">
-          {{comment}}
+          <span class="contents">{{comment}}</span>
           <div class="date">
             {{date}} {{time}}<br>
           </div>