From 02569c2dfa663c47441ae8a1af41dd92a50e8c06 Mon Sep 17 00:00:00 2001 From: Daniel Saewitz Date: Fri, 22 Feb 2013 22:30:28 -0500 Subject: [PATCH] Fix errors --- package.json | 3 ++- src/server/middleware.coffee | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index d2b409f62d..4f5e2c3e1d 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,8 @@ "querystring": "~0.1.0", "superagent": "~0.12.4", "resolve": "~0.2.3", - "browserify": "1.17.3" + "browserify": "1.17.3", + "validator": "~0.4.24" }, "private": true, "subdomain": "habitrpg", diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee index 6fa8210a1d..e2183f2ea9 100644 --- a/src/server/middleware.coffee +++ b/src/server/middleware.coffee @@ -1,17 +1,17 @@ module.exports.splash = (req, res, next) -> # This was an API call, not a page load -return next() if /^\/(api)|(v1)/.test req.path + return next() if /^\/(api)|(v1)/.test req.path -unless req.query?.play? or req.getModel().get('_userId') - res.redirect('/splash.html') -else - next() + unless req.query?.play? or req.getModel().get('_userId') + res.redirect('/splash.html') + else + next() module.exports.view = (req, res, next) -> - model = req.getModel() - _view = model.get('_view') || {} - ## Set _mobileDevice to true or false so view can exclude portions from mobile device - _view.mobileDevice = /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header 'User-Agent') - _view.nodeEnv = process.env.NODE_ENV - model.set '_view', _view - next() + model = req.getModel() + _view = model.get('_view') || {} + ## Set _mobileDevice to true or false so view can exclude portions from mobile device + _view.mobileDevice = /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header 'User-Agent') + _view.nodeEnv = process.env.NODE_ENV + model.set '_view', _view + next()