BF: round() in JS wasn't using our own version but Math.round()

psychopy · Oct 23, 2020 · 6ce967b · 6ce967b
1 parent 2b9b132
commit 6ce967b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/psychopy/experiment/components/settings/__init__.py b/psychopy/experiment/components/settings/__init__.py
@@ -574,6 +574,7 @@ def writeInitCodeJS(self, buff, version, localDateTime, modular=True):
                     "import * as util from './lib/util{version}.js';\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)
             buff.writeIndentedLines(code)
 

diff --git a/psychopy/experiment/py2js_transpiler.py b/psychopy/experiment/py2js_transpiler.py
@@ -48,7 +48,7 @@ class pythonTransformer(ast.NodeTransformer):
     subtitutableOperations = []
 
     # operations from the math python module or builtin operations that exist in JavaScript Math:
-    directMathOperations = ['abs', 'min', 'max', 'round', 'ceil', 'fabs', 'floor', 'trunc', 'exp', 'log', 'log2', 'pow',
+    directMathOperations = ['abs', 'min', 'max', 'ceil', 'fabs', 'floor', 'trunc', 'exp', 'log', 'log2', 'pow',
                             'sqrt', 'acos', 'asin', 'atan2', 'cos', 'sin', 'tan', 'acosh', 'asinh', 'atanh', 'cosh',
                             'sinh', 'tanh']