From f0f565e5ccb09d2d1609a3200687ff44c12da590 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Tue, 19 Feb 2013 13:38:26 -0500 Subject: [PATCH] put reset dom back in --- src/app/character.coffee | 10 ++-------- src/app/scoring.coffee | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/app/character.coffee b/src/app/character.coffee index 39494ea822..2b29f543e3 100644 --- a/src/app/character.coffee +++ b/src/app/character.coffee @@ -179,20 +179,14 @@ module.exports.BatchUpdate = BatchUpdate = (model) -> user: user obj: -> - obj ?= model.get('users.'+user.get('id'), true) + obj ?= model.get 'users.'+user.get('id') return obj startTransaction: -> # start a batch transaction - nothing between now and @commit() will be set immediately transactionInProgress = true model._dontPersist = true - - # Really strange, user.get() seems to only return attributes which have previously been accessed. So in - # many cases, userObj.tasks.{taskId}.value is undefined - so we manually .get() each attribute here. - # Additionally, for some reason after getting the user object, changing properies manually (userObj.stats.hp = 50) - # seems to actually run user.set('stats.hp',50) which we don't want to do - so we deepClone here - #_.each Object.keys(userSchema), (key) -> obj[key] = lodash.cloneDeep user.get(key) - obj = @obj() + @obj() ### Handles updating the user model. If this is an en-mass operation (eg, server cron), changes are queued diff --git a/src/app/scoring.coffee b/src/app/scoring.coffee index c87b424994..2eb2065c60 100644 --- a/src/app/scoring.coffee +++ b/src/app/scoring.coffee @@ -260,7 +260,7 @@ cron = () -> batch.setStats() batch.set('history', obj.history) batch.commit() - #browser.resetDom(model) + browser.resetDom(model) setTimeout (-> user.set 'stats.hp', hpAfter), 1000 # animate hp loss