summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-11-13 12:00:59 -0500
committerJules Laplace <jules@okfoc.us>2014-11-13 12:00:59 -0500
commit28ade7d7f9e1c8e35de713a04303538140e22ea9 (patch)
tree3c4d77b1f42b9e1849e3ac1192caa2151a77064d /server
parent3ab0c6c24b95552feb111b647205cc92c3ca170c (diff)
use plain html and \n -> <br> formatting on docs
Diffstat (limited to 'server')
-rw-r--r--server/lib/util.js4
-rw-r--r--server/lib/views/index.js2
2 files changed, 4 insertions, 2 deletions
diff --git a/server/lib/util.js b/server/lib/util.js
index 791d3e2..0a71cb7 100644
--- a/server/lib/util.js
+++ b/server/lib/util.js
@@ -30,7 +30,9 @@ util.capitalizeWord = function (s) {
util.escapeRegExp = function (s) {
return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&")
}
-
+util.htmlize = function(s) {
+ return ("<p>" + s.replace(/\n/g,"</p><p>") + "</p>").replace(/<p><\/p>/, "<br>")
+}
util.cleanQuery = function (query) {
var update = _.extend({}, query);
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index 6e3b449..b3a15c2 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -130,7 +130,7 @@ var views = module.exports = {
}
res.render('docs', {
doc: doc,
- content: marked(doc.body),
+ content: util.htmlize(doc.body),
isNew: false
})
})