Merge pull request #2306 from dvbridges/JSexperimentNaming

BF: Fixes file and exp name mismatch causing online studies to fail
psychopy · Feb 25, 2019 · 0a7bc2d · 0a7bc2d
2 parents 8b50198 + 0ab8fa6
commit 0a7bc2d
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/psychopy/experiment/components/settings/__init__.py b/psychopy/experiment/components/settings/__init__.py
@@ -495,11 +495,11 @@ def copyFileWithMD5(src, dst):
     def writeInitCodeJS(self, buff, version, localDateTime, modular=True):
         # create resources folder
         self.prepareResourcesJS()
-
+        jsFilename = os.path.basename(os.path.splitext(self.exp.filename)[0])
         # html header
         template = readTextFile("JS_htmlHeader.tmpl")
         header = template.format(
-            name=self.params['expName'].val,  # prevent repr() conversion
+            name=jsFilename,
             version=version,
             params=self.params)
         jsFile = self.exp.expPath
@@ -511,11 +511,11 @@ def writeInitCodeJS(self, buff, version, localDateTime, modular=True):
         html.close()
 
         # Write header comment
-        starLen = "*"*(len(self.params['expName'].val)+9)
+        starLen = "*"*(len(jsFilename) + 9)
         code = ("/%s \n"
                " * %s Test *\n" 
                " %s/\n\n")
-        buff.writeIndentedLines(code % (starLen, self.params['expName'].val.title(), starLen))
+        buff.writeIndentedLines(code % (starLen, jsFilename.title(), starLen))
 
         # Write imports if modular
         if modular:
@@ -532,9 +532,9 @@ def writeInitCodeJS(self, buff, version, localDateTime, modular=True):
         # Write window code
         self.writeWindowCodeJS(buff)
         code = ("\n// store info about the experiment session:\n"
-                "let expName = %s;  // from the Builder filename that created this script\n"
+                "let expName = '%s';  // from the Builder filename that created this script\n"
                 "let expInfo = %s;\n"
-                "\n" % (self.params['expName'], self.getInfo()))
+                "\n" % (jsFilename, self.getInfo()))
         buff.writeIndentedLines(code)
 
     def writeExpSetupCodeJS(self, buff, version):