Merge branch 'develop' into priority-multiplier

This commit is contained in:
Tyler Renelle
2013-03-03 21:25:13 -05:00
5 changed files with 52 additions and 31 deletions
+3
View File
@@ -60,6 +60,9 @@ module.exports.app = (appExports, model) ->
appExports.closeAlgosNotification = (e, el) ->
user.set('flags.algosNotification', 'hide')
appExports.closeOnliesNotification = (e, el) ->
user.set('flags.onliesNotification', 'hide')
appExports.customizeGender = (e, el) ->
user.set 'preferences.gender', $(el).attr('data-value')
+3
View File
@@ -217,6 +217,9 @@ cron = (model) ->
value = obj.tasks[taskObj.id].value #get updated value
absVal = if (completed) then Math.abs(value) else value
todoTally += absVal
else if type is 'habit' #reset 'onlies' value to 0
if taskObj.up==false or taskObj.down==false
batch.set "tasks.#{taskObj.id}.value", 0
# Finished tallying
obj.history ?= {}; obj.history.todos ?= []; obj.history.exp ?= []