From f6e53a377f08cb25b92e2de49b4c7e34e8f0f003 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Mon, 8 Apr 2013 11:24:45 -0400
Subject: [PATCH] some bug-fixes & cleanup on removal of _view.*

---
 src/app/index.coffee         | 6 +-----
 src/server/middleware.coffee | 6 ++----
 src/server/private.coffee    | 1 -
 src/server/static.coffee     | 4 ++--
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/app/index.coffee b/src/app/index.coffee
index 1acde3e906..adc1561cc4 100644
--- a/src/app/index.coffee
+++ b/src/app/index.coffee
@@ -22,9 +22,6 @@ _ = require('underscore')
 get '/', (page, model, params, next) ->
   return page.redirect '/' if page.params?.query?.play?
 
-  # temporary view variables, so we don't call model.set() too fast
-  _view = model.get '_view' || {}
-
   # Force SSL # NOTE handled by ngix now
   #req = page._res.req
   #if req.headers['x-forwarded-proto']!='https' and process.env.NODE_ENV=='production'
@@ -35,7 +32,6 @@ get '/', (page, model, params, next) ->
     user.setNull('apiToken', derby.uuid())
 
     require('./items').server(model)
-    model.set '_view', _view
 
     #refLists
     _.each ['habit', 'daily', 'todo', 'reward'], (type) ->
@@ -61,6 +57,6 @@ ready (model) ->
   require('./profile').app(exports, model)
   require('./pets').app(exports, model)
   require('../server/private').app(exports, model)
-  require('./debug').app(exports, model) if model.get('_nodeEnv') != 'production'
+  require('./debug').app(exports, model) if model.flags.nodeEnv != 'production'
   require('./browser').app(exports, model, app)
 
diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee
index 067bbceffd..3a3304ae00 100644
--- a/src/server/middleware.coffee
+++ b/src/server/middleware.coffee
@@ -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
diff --git a/src/server/private.coffee b/src/server/private.coffee
index 1606395bf5..fb9945bb57 100644
--- a/src/server/private.coffee
+++ b/src/server/private.coffee
@@ -10,7 +10,6 @@ module.exports.app = (appExports, model) ->
 
   appExports.showStripe = (e, el) ->
     token = (res) ->
-      console.log(res);
       $.ajax({
          type: "POST",
          url: "/charge",
diff --git a/src/server/static.coffee b/src/server/static.coffee
index af6a2371f3..4b5cbe6b3e 100644
--- a/src/server/static.coffee
+++ b/src/server/static.coffee
@@ -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'