Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#1057] use sanitized o.dayStart, not options.dayStart. slightly better sanitize(dayStart)

Browse Source
This commit is contained in:
Tyler Renelle
2013-11-29 16:47:08 -07:00
parent 671c130512
commit bf7f7b6583
2 changed files with 22 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/helpers.coffee
+2 -2
View File
@@ -8,7 +8,7 @@ items = require('./items.coffee')
{now} is also passed in for various purposes, one example being the test scripts scripts testing different "now" times
###
sanitizeOptions = (o) ->
dayStart = if (o.dayStart and 0 <= +o.dayStart <= 24) then +o.dayStart else 0
dayStart = if (!_.isNaN(+o.dayStart) and 0 <= +o.dayStart <= 24) then +o.dayStart else 0
timezoneOffset = if o.timezoneOffset then +(o.timezoneOffset) else +moment().zone()
now = if o.now then moment(o.now).zone(timezoneOffset) else moment(+new Date).zone(timezoneOffset)
# return a new object, we don't want to add "now" to user object
@@ -20,7 +20,7 @@ startOfWeek = (options={}) ->
startOfDay = (options={}) ->
o = sanitizeOptions(options)
moment(o.now).startOf('day').add('h', options.dayStart)
moment(o.now).startOf('day').add('h', o.dayStart)
dayMapping = {0:'su',1:'m',2:'t',3:'w',4:'th',5:'f',6:'s'}