Merge pull request #2244 from dvbridges/sliderFix

BF: Reactivate forceEndRoutine for Slider.
psychopy · Jan 30, 2019 · f519b69 · f519b69
2 parents fce0245 + a0ca2e3
commit f519b69
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/psychopy/experiment/components/slider/__init__.py b/psychopy/experiment/components/slider/__init__.py
@@ -260,12 +260,12 @@ def writeFrameCode(self, buff):
 
     def writeFrameCodeJS(self, buff):
         super(SliderComponent, self).writeFrameCodeJS(buff)  # Write basevisual frame code
-        # forceEnd = self.params['forceEndRoutine'].val
-        # if forceEnd:
-        #     code = ("\n// Check %(name)s for response to end routine\n"
-        #             "if (%(name)s.getRating() !== 'undefined' && %(name)s.status === PsychoJS.Status.STARTED) {\n"
-        #             "  continueRoutine = false; }\n")
-        #     buff.writeIndentedLines(code % (self.params))
+        forceEnd = self.params['forceEndRoutine'].val
+        if forceEnd:
+            code = ("\n// Check %(name)s for response to end routine\n"
+                    "if (%(name)s.getRating() !== 'undefined' && %(name)s.status === PsychoJS.Status.STARTED) {\n"
+                    "  continueRoutine = false; }\n")
+            buff.writeIndentedLines(code % (self.params))
 
     def writeRoutineEndCode(self, buff):
         name = self.params['name']