diff --git a/src/app/browser.coffee b/src/app/browser.coffee index 1d5513662b..37c51eb658 100644 --- a/src/app/browser.coffee +++ b/src/app/browser.coffee @@ -8,7 +8,7 @@ moment = require 'moment' ### loadJavaScripts = (model) -> - unless model.get('_view.mobileDevice') + unless model.get('_mobileDevice') require '../../public/vendor/jquery-ui/ui/jquery.ui.core' require '../../public/vendor/jquery-ui/ui/jquery.ui.widget' require '../../public/vendor/jquery-ui/ui/jquery.ui.mouse' @@ -22,7 +22,7 @@ loadJavaScripts = (model) -> Setup jQuery UI Sortable ### setupSortable = (model) -> - unless (model.get('_view.mobileDevice') == true) #don't do sortable on mobile + unless (model.get('_mobileDevice') == true) #don't do sortable on mobile _.each ['habit', 'daily', 'todo', 'reward'], (type) -> $("ul.#{type}s").sortable dropOnEmpty: false @@ -177,7 +177,7 @@ loadExternalScripts = (model) -> # JS files not needed right away (google charts) or entirely optional (analytics) # Each file getsload asyncronously via $.getScript, so it doesn't bog page-load - unless model.get('_view.mobileDevice') + unless model.get('_mobileDevice') $.getScript("//s7.addthis.com/js/250/addthis_widget.js#pubid=lefnire") @@ -191,14 +191,14 @@ loadExternalScripts = (model) -> module.exports.app = (appExports, model, app) -> loadJavaScripts(model) - setupGrowlNotifications(model) unless model.get('_view.mobileDevice') + setupGrowlNotifications(model) unless model.get('_mobileDevice') app.on 'render', (ctx) -> #restoreRefs(model) setupSortable(model) setupTooltips(model) setupTour(model) - initStickyHeader(model) unless model.get('_view.mobileDevice') + initStickyHeader(model) unless model.get('_mobileDevice') loadExternalScripts(model) $('.datepicker').datepicker({autoclose:true, todayBtn:true}) .on 'changeDate', (ev) -> diff --git a/src/app/index.coffee b/src/app/index.coffee index 780922f09d..33aedbc772 100644 --- a/src/app/index.coffee +++ b/src/app/index.coffee @@ -65,6 +65,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('_view.nodeEnv') != 'production' + require('./debug').app(exports, model) if model.get('_nodeEnv') != 'production' require('./browser').app(exports, model, app) diff --git a/src/app/items.coffee b/src/app/items.coffee index 9cc48fdab7..03e1eeb2a0 100644 --- a/src/app/items.coffee +++ b/src/app/items.coffee @@ -113,11 +113,11 @@ module.exports.app = (appExports, model) -> appExports.activateRewardsTab = -> - model.set '_view.activeTabRewards', true - model.set '_view.activeTabPets', false + model.set '_activeTabRewards', true + model.set '_activeTabPets', false appExports.activatePetsTab = -> - model.set '_view.activeTabPets', true - model.set '_view.activeTabRewards', false + model.set '_activeTabPets', true + model.set '_activeTabRewards', false model.on 'set', '_user.flags.itemsEnabled', (captures, args) -> return unless captures is true @@ -160,12 +160,12 @@ module.exports.updateStore = updateStore = (model) -> _.each ['weapon', 'armor', 'shield', 'head'], (type) -> i = parseInt(obj?.items?[type] || 0) + 1 nextItem = if (i == _.size items[type]) then {hide:true} else items[type][i] - model.set "_view.items.#{type}", nextItem + model.set "_items.#{type}", nextItem - model.set '_view.items.potion', items.potion - model.set '_view.items.reroll', items.reroll - model.set '_view.items.pets', items.pets - model.set '_view.items.hatchingPotions', items.hatchingPotions + model.set '_items.potion', items.potion + model.set '_items.reroll', items.reroll + model.set '_items.pets', items.pets + model.set '_items.hatchingPotions', items.hatchingPotions diff --git a/src/app/party.coffee b/src/app/party.coffee index 91902f689f..b4f1ccb9c6 100644 --- a/src/app/party.coffee +++ b/src/app/party.coffee @@ -113,10 +113,10 @@ module.exports.app = (appExports, model) -> throw err if err u = res.at(0).get() if !u? - model.set "_view.partyError", "User with id #{id} not found." + model.set "_partyError", "User with id #{id} not found." return else if u.party.current? or u.party.invitation? - model.set "_view.partyError", "User already in a party or pending invitation." + model.set "_partyError", "User already in a party or pending invitation." return else p = model.at '_party' diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee index 60a392faee..067bbceffd 100644 --- a/src/server/middleware.coffee +++ b/src/server/middleware.coffee @@ -9,8 +9,8 @@ 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 + _mobileDevice = /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(req.header 'User-Agent') + _nodeEnv = process.env.NODE_ENV model.set '_view', _view next() diff --git a/views/app/avatar.html b/views/app/avatar.html index ec1d6f8c71..a83ca6ee89 100644 --- a/views/app/avatar.html +++ b/views/app/avatar.html @@ -231,7 +231,7 @@