some bug-fixes & cleanup on removal of _view.*

This commit is contained in:
Tyler Renelle
2013-04-08 11:24:45 -04:00
parent ba750141cf
commit f6e53a377f
4 changed files with 5 additions and 12 deletions
+2 -4
View File
@@ -7,11 +7,9 @@ module.exports.splash = (req, res, 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
_mobileDevice = /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header 'User-Agent')
_nodeEnv = process.env.NODE_ENV
model.set '_view', _view
model.set '_mobileDevice', /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header 'User-Agent')
model.set '_nodeEnv', model.flags.nodeEnv
next()
#CORS middleware
-1
View File
@@ -10,7 +10,6 @@ module.exports.app = (appExports, model) ->
appExports.showStripe = (e, el) ->
token = (res) ->
console.log(res);
$.ajax({
type: "POST",
url: "/charge",
+2 -2
View File
@@ -8,10 +8,10 @@ derby = require 'derby'
staticPages = derby.createStatic path.dirname(path.dirname(__dirname))
beforeEach = (req, res, next) ->
req.getModel().set '_view', {nodeEnv: 'production'} # we don't want cheat buttons on static pages
req.getModel().set '_nodeEnv', 'production' # we don't want cheat buttons on static pages
next()
router.get '/splash.html', (req, res) -> return res.redirect('/static/front')
router.get '/splash.html', (req, res) -> res.redirect('/static/front')
router.get '/static/front', beforeEach, (req, res) -> staticPages.render 'static/front', res
router.get '/static/about', (req, res) -> res.redirect 'http://community.habitrpg.com/node/97'
router.get '/static/team', (req, res) -> res.redirect 'http://community.habitrpg.com/node/96'