Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12
Conflicts: dist/spritesmith0.png dist/spritesmith1.png dist/spritesmith2.png dist/spritesmith3.png dist/spritesmith4.png
This commit is contained in:
+1
-4
@@ -248,13 +248,10 @@ api.silver = (num) ->
|
||||
###
|
||||
Task classes given everything about the class
|
||||
###
|
||||
api.taskClasses = (task, filters=[], dayStart=0, lastCron=+new Date, showCompleted=false, main=false) ->
|
||||
api.taskClasses = (task, filters=[], dayStart=0, lastCron=+new Date, main=false) ->
|
||||
return unless task
|
||||
{type, completed, value, repeat} = task
|
||||
|
||||
# completed / remaining toggle
|
||||
return 'hidden' if (type is 'todo' and completed != showCompleted) and main
|
||||
|
||||
# Filters
|
||||
if main # only show when on your own list
|
||||
if !task._editing # always show task being edited (even when tag removed)
|
||||
|
||||
Reference in New Issue
Block a user