started writing my own formatdoc

ryanramage · May 23, 2012 · 4180458 · 4180458
1 parent ae8f8d6
commit 4180458
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 1 deletion.
diff --git a/app.js b/app.js
@@ -75,6 +75,7 @@ ddoc.views.item = {
 
                 comment.points = util.getPoints(c.voted);
                 comment.score = util.findScore(comment.points, c.comment_id);
+                comment.text = util.formatdoc(comment.text);
 
                 comments.push(comment);
             }

diff --git a/common/util.js b/common/util.js
@@ -78,3 +78,16 @@ exports.timeDifference = function(current, previous) {
          return  Math.round(elapsed/msPerYear ) + ' years ago';   
     }
 }
+
+exports.formatdoc = function(content) {
+    var newlines = '[(\\r)?\\n]+';
+
+    // first remove the newlines from the beginning and end of the content
+    content = content.replace(new RegExp('^' + newlines, 'g'), '');
+    content = content.replace(new RegExp(newlines + '$', 'g'), '');
+
+    // then replace each newlines with the paragraphs
+    content = '<p>' + content.replace(new RegExp(newlines, 'g'), '</p><p>') + '</p>';
+
+    return content;
+}
diff --git a/templates/item.html b/templates/item.html
@@ -58,7 +58,7 @@
                                         <br>
                                         <span class="comment">
                                             <font color="#000000">
-                                            {{text}}     
+                                            {{{text}}}     
                                             </font>
                                             {{#username}}
                                             <p><font size="1"><u><a class="commentreply" comment_id="{{comment_id}}" href="#">reply</a></u></font></p>

diff --git a/templates/partials/head.html b/templates/partials/head.html
@@ -14,6 +14,12 @@
 });
 </script>
 
+<style>
+.comment p:first-child {
+    margin-top:0;
+}
+</style>
+
 </head>
 
 <body>