BF: JS outputs from Builder not detecting non-response correctly

Go/no-go tasks weren't working as a result
psychopy · Jan 31, 2019 · 0c3cea2 · 0c3cea2
1 parent a873397
commit 0c3cea2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/psychopy/experiment/components/keyboard/__init__.py b/psychopy/experiment/components/keyboard/__init__.py
@@ -490,16 +490,16 @@ def writeRoutineEndCodeJS(self, buff):
 
         # write the actual code
         code = ("\n// check responses\n"
-                "if (['', [], undefined].indexOf(%(name)s.keys) >= 0) {"
+                "if (%(name)s.keys === undefined || %(name)s.keys.length === 0) {"
                 "    // No response was made\n"
                 "    %(name)s.keys = undefined;\n"
                 "}\n\n")
         buff.writeIndentedLines(code % self.params)
 
         if self.params['storeCorrect'].val:  # check for correct NON-repsonse
             code = ("// was no response the correct answer?!\n"
-                    "if (%(name)s.keys == undefined) {\n"
-                    "  if (psychoJS.str(%(correctAns)s).toLowerCase() == 'none') {\n"
+                    "if (%(name)s.keys === undefined) {\n"
+                    "  if (['None','none',undefined].includes(%(correctAns)s)) {\n"
                     "     %(name)s.corr = 1  // correct non-response\n"
                     "  } else {\n"
                     "     %(name)s.corr = 0  // failed to respond (incorrectly)\n"