diff options
| author | Michael Ball <cycomachead@gmail.com> | 2015-06-15 18:49:24 -0700 |
|---|---|---|
| committer | Michael Ball <cycomachead@gmail.com> | 2015-06-15 18:49:24 -0700 |
| commit | 93d67ed386bba4862ac00eb55dcf664300ce53c7 (patch) | |
| tree | d9d0ac08b2dbce9acae0cacb98e9d6996a2cbb0a | |
| parent | 3885ced35aee903f74d48c293bc3f0665a38dba5 (diff) | |
| download | snap-93d67ed386bba4862ac00eb55dcf664300ce53c7.tar.gz snap-93d67ed386bba4862ac00eb55dcf664300ce53c7.zip | |
Fix Error Handing in the DATE block
For some reason the function wasnt properly catching errors and was instead rasing native
JS errors. This fixes that bug, so the function will now report nothing when it doesnt know
what to do.
In addition, moving the variable `dateMap` inside the function reduces a global variable, which
shouldnt affect anything other than keeping the code clean. :)
| -rw-r--r-- | threads.js | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -2640,26 +2640,26 @@ Process.prototype.reportTimer = function () { }; // Process Dates and times in Snap -// Map block options to built-in functions -var dateMap = { - 'year' : 'getFullYear', - 'month' : 'getMonth', - 'date': 'getDate', - 'day of week' : 'getDay', - 'hour' : 'getHours', - 'minute' : 'getMinutes', - 'second' : 'getSeconds', - 'time in milliseconds' : 'getTime' -}; - Process.prototype.reportDate = function (datefn) { var inputFn = this.inputOption(datefn), - currDate = new Date(), - func = dateMap[inputFn], - result = currDate[func](); + // Map block options to built-in functions + dateMap = { + 'year' : 'getFullYear', + 'month' : 'getMonth', + 'date': 'getDate', + 'day of week' : 'getDay', + 'hour' : 'getHours', + 'minute' : 'getMinutes', + 'second' : 'getSeconds', + 'time in milliseconds' : 'getTime' + }; if (!dateMap[inputFn]) { return ''; } + var currDate = new Date(), + func = dateMap[inputFn], + result = currDate[func](); + // Show months as 1-12 and days as 1-7 if (inputFn === 'month' || inputFn === 'day of week') { result += 1; |
