Merge pull request #836 from cycomachead/date-error-fix

Fix Error Handing in the DATE block

1 files changed, 15 insertions, 15 deletions

diff --git a/threads.js b/threads.js
index 165ad0e..efe9ba4 100644
--- a/threads.js
+++ b/threads.js
@@ -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;