From b2d6596f92d454dce6d64a28bf4052a57ea0b0ac Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Wed, 14 Nov 2012 18:08:45 -0500 Subject: [PATCH] move _nodeEnv setup into master --- lib/app/scoring.js | 4 +++- lib/server/index.js | 1 + lib/server/serverRoutes.js | 2 +- src/server/index.coffee | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/app/scoring.js b/lib/app/scoring.js index 24d8f30a4e..92c4073411 100644 --- a/lib/app/scoring.js +++ b/lib/app/scoring.js @@ -20,7 +20,9 @@ model = void 0; setModel = function(m) { model = m; user = model.at('_user'); - return setupNotifications(); + if (!model.get('_mobileDevice')) { + return setupNotifications(); + } }; setupNotifications = function() { diff --git a/lib/server/index.js b/lib/server/index.js index 12fc29ea85..f7817fc893 100644 --- a/lib/server/index.js +++ b/lib/server/index.js @@ -64,6 +64,7 @@ habitrpgMiddleware = function(req, res, next) { var model; model = req.getModel(); model.set('_mobileDevice', /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header('User-Agent'))); + model.set('_nodeEnv', process.env.NODE_ENV); auth.setRequest(req); auth.newUserAndPurl(); return next(); diff --git a/lib/server/serverRoutes.js b/lib/server/serverRoutes.js index dde906addd..96067144fa 100644 --- a/lib/server/serverRoutes.js +++ b/lib/server/serverRoutes.js @@ -55,7 +55,7 @@ module.exports = function(expressApp, root, derby) { model.at('_habitList').push({ id: taskId, type: 'habit', - text: (title || taskId) + ' *', + text: title || taskId, value: 0, up: true, down: true, diff --git a/src/server/index.coffee b/src/server/index.coffee index 5c64501fe1..f018e2d0fa 100644 --- a/src/server/index.coffee +++ b/src/server/index.coffee @@ -40,6 +40,7 @@ habitrpgMiddleware = (req, res, next) -> model = req.getModel() ## Set _mobileDevice to true or false so view can exclude portions from mobile device model.set '_mobileDevice', /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header 'User-Agent') + model.set '_nodeEnv', process.env.NODE_ENV auth.setRequest(req) # Need to pass into auth, so auth can save as private variable used later by EveryAuth auth.newUserAndPurl() next()