diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-12-01 19:05:47 -0500 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-12-01 19:05:47 -0500 |
| commit | 3894b197a61f7370597218cda6a2a5eccde9375b (patch) | |
| tree | 134c72dd76b2873994c428a0dd9e4c6a7c3ebfe7 /server/lib | |
| parent | 598b7d86716d83f3f5c571c98dbf41ae1706cb40 (diff) | |
| parent | c423e246d4e18ce65861e384bee6c147aff79ddb (diff) | |
merge
Diffstat (limited to 'server/lib')
| -rw-r--r-- | server/lib/util.js | 10 | ||||
| -rw-r--r-- | server/lib/views/index.js | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/server/lib/util.js b/server/lib/util.js index 273d7d1..e3fd1ed 100644 --- a/server/lib/util.js +++ b/server/lib/util.js @@ -10,8 +10,9 @@ var entities = new RegExp("[<>&]", 'g') var util = {} -util.trim = function (s){ return (s || "").replace(whitespaceHead,"").replace(whitespaceTail,"") } - +util.trim = function (s){ + return (s || "").replace(whitespaceHead,"").replace(whitespaceTail,"") +} util.slugify = function (s){ return (s || "").toLowerCase().replace(whitespace,"-").replace(nonAlphanumerics, '-').replace(consecutiveDashes,"-") } @@ -33,7 +34,6 @@ util.escapeRegExp = function (s) { util.htmlize = function(s) { return s.replace(/\n/g,"<br>") } - util.cleanQuery = function (query) { var update = _.extend({}, query); delete update._id; @@ -43,14 +43,10 @@ util.cleanQuery = function (query) { delete update.created_by; return update; } - util.ip2num = function(dot) { - console.log(dot); - var d = (dot || "127.0.0.1").split('.'); return ((((((+d[0])*256)+(+d[1]))*256)+(+d[2]))*256)+(+d[3]); } - util.num2ip = function(num) { if (! num) return "" var d = num % 256; diff --git a/server/lib/views/index.js b/server/lib/views/index.js index 145b5ac..6ceef7e 100644 --- a/server/lib/views/index.js +++ b/server/lib/views/index.js @@ -111,12 +111,16 @@ var views = module.exports = { }, docs: function (req, res){ - var name = req.params.name || "howto" + var name = req.params.name || "about" if (name == "howto") { res.render('about/' + name) return } + if (name == "about" || name == "index") { + res.render('about/' + name) + return + } if (name === "new") { res.render('docs', { |