From 0c3cea2b276c3dc93aedb5e3568ef00b2ee5550c Mon Sep 17 00:00:00 2001 From: Jonathan Peirce Date: Sun, 20 Jan 2019 15:06:01 +0000 Subject: [PATCH] BF: JS outputs from Builder not detecting non-response correctly Go/no-go tasks weren't working as a result --- psychopy/experiment/components/keyboard/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/psychopy/experiment/components/keyboard/__init__.py b/psychopy/experiment/components/keyboard/__init__.py index 5df30515e9..cb1456dbd8 100644 --- a/psychopy/experiment/components/keyboard/__init__.py +++ b/psychopy/experiment/components/keyboard/__init__.py @@ -490,7 +490,7 @@ 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") @@ -498,8 +498,8 @@ def writeRoutineEndCodeJS(self, buff): 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"