BF: useVersion was not being used for the JS code, only the HTML

peircej · peircej · commit 017c18f2f31e · 2021-07-27T10:24:32.000+01:00
This was resulting in a mismatch meaning that the PsychoJS was not loading
diff --git a/psychopy/experiment/components/settings/JS_htmlHeader.tmpl b/psychopy/experiment/components/settings/JS_htmlHeader.tmpl
@@ -6,7 +6,7 @@
     <title>{name} [PsychoPy]</title>
     <!-- styles -->
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery-ui-dist@1.12.1/jquery-ui.min.css">
-    <link rel="stylesheet" href="./lib/psychojs{version}.css">
+    <link rel="stylesheet" href="./lib/psychojs-{version}.css">
   </head>
   <body>
     <div id="root"></div>
@@ -17,7 +17,7 @@
     <!-- experiment -->
     <script src="./{name}.js" type="module"></script>
     <!-- legacy browsers -->
-    <script src="./lib/psychojs{version}.iife.js" nomodule></script>
+    <script src="./lib/psychojs-{version}.iife.js" nomodule></script>
     <script src="./{name}-legacy-browsers.js" nomodule></script>
   </body>
 </html>
diff --git a/psychopy/experiment/components/settings/__init__.py b/psychopy/experiment/components/settings/__init__.py
@@ -753,7 +753,7 @@ def writeInitCodeJS(self, buff, version, localDateTime, modular=True):
         elif useVer == 'latest':
             useVer = versions.latestVersion()
         else:
-            version = versions.fullVersion(useVer)
+            useVer = versions.fullVersion(useVer)
 
         # do we shorten minor versions ('3.4.2' to '3.4')?
         # only from 3.2 onwards
@@ -765,14 +765,11 @@ def writeInitCodeJS(self, buff, version, localDateTime, modular=True):
             # e.g. 2021.1.0 not 2021.1.0.dev3
             useVer = '.'.join(useVer.split('.')[:3])
 
-        # prepend the hyphen
-        versionStr = '-{}'.format(useVer)
-
         # html header
         template = readTextFile("JS_htmlHeader.tmpl")
         header = template.format(
             name=jsFilename,
-            version=versionStr,
+            version=useVer,
             params=self.params)
         jsFile = self.exp.expPath
         folder = os.path.dirname(jsFile)
@@ -792,14 +789,14 @@ def writeInitCodeJS(self, buff, version, localDateTime, modular=True):
         # Write imports if modular
         if modular:
             code = (
-                    "import {{ core, data, sound, util, visual }} from './lib/psychojs-2021.2.0.js';\n"
+                    "import {{ core, data, sound, util, visual }} from './lib/psychojs-{version}.js';\n"
                     "const {{ PsychoJS }} = core;\n"
                     "const {{ TrialHandler }} = data;\n"
                     "const {{ Scheduler }} = util;\n"
                     "//some handy aliases as in the psychopy scripts;\n"
                     "const {{ abs, sin, cos, PI: pi, sqrt }} = Math;\n"
                     "const {{ round }} = util;\n"
-                    "\n").format(version=versionStr)
+                    "\n").format(version=useVer)
             buff.writeIndentedLines(code)
 
         code = ("\n// store info about the experiment session:\n"
