1
0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-11 16:18:10 +00:00
Commit Graph

844 Commits

Author SHA1 Message Date
Sotiri Bakagiannis
19c062c77c visual/Form: add Form.Type.SLIDER support 2021-06-11 20:38:37 +01:00
Sotiri Bakagiannis
2776ad417f visual/Form: no need to alias RADIO as CHOICE type in Form.Types 2021-06-11 20:31:59 +01:00
tpronk
d613518ca6
Update Automated Test (full).yml 2021-06-11 15:49:31 +01:00
Alain Pitiot
04bd836e0a
Merge pull request #393 from apitiot/master
fromSnapshot now handles thisTrial as well
2021-06-11 15:30:07 +02:00
Alain Pitiot
9865eaba4a fromSnapshot now handles thisTrial as well 2021-06-11 15:29:36 +02:00
Alain Pitiot
5d4101b84d
Merge pull request #392 from apitiot/master
added a getter for finished in TrialHandler
2021-06-11 15:17:40 +02:00
Alain Pitiot
598fa080ee added a getter for finished in TrialHandler 2021-06-11 15:16:02 +02:00
Alain Pitiot
cad60bb964
Merge pull request #390 from thewhodidthis/bf#322--slider
visual/Slider: provide fillColor aliases for markerColor
2021-06-11 10:19:18 +02:00
Alain Pitiot
117bca855f
Merge pull request #389 from thewhodidthis/bf#388--git-cleanup
git: clear out extra JS / CSS index files in package root
2021-06-11 10:18:49 +02:00
Alain Pitiot
c753469e1c
Merge pull request #385 from thewhodidthis/bf#341--textbox-scroll
visual/TextInput: permanently disable substitute text
2021-06-11 10:18:22 +02:00
Alain Pitiot
0da4e6ff66
Merge pull request #391 from apitiot/master
added the notion of dependent stimuli to Slider
2021-06-11 10:14:38 +02:00
Alain Pitiot
c9b19c657b added the notion of dependent stimuli to Slider, in order to accommodate a more standard way of rendering Form in the generated .js code, i.e. form.setAutoDraw(true), rather than the historically correct form.draw() 2021-06-11 10:12:59 +02:00
Sotiri Bakagiannis
0e3a23f5d0 visual/Slider: provide fillColor aliases for markerColor 2021-06-11 08:45:05 +01:00
Sotiri Bakagiannis
c3e35e7713 git: clear out extra JS / CSS index files in package root 2021-06-11 07:23:25 +01:00
Alain Pitiot
94264e3e75
Merge pull request #387 from apitiot/master
added fromSnapshot static method to TrialHandler
2021-06-11 07:24:33 +02:00
Alain Pitiot
fcd7642bee added fromSnapshot static method to TrialHandler to restore internal state from snapshot; should fix the nested loop thisN issue 2021-06-11 07:20:30 +02:00
Sotiri Bakagiannis
13461b9169 visual/TextInput: permanently disable substitute text 2021-06-10 18:38:54 +01:00
Alain Pitiot
b9aee09474
Merge pull request #382 from tpronk/fix_seedrandom
BF: Make seedrandom work again
2021-06-10 15:26:00 +02:00
Thomas Pronk
fb0b231014 RF: follow PsychoJS style guide 2021-06-10 13:13:41 +01:00
Thomas Pronk
170cf423d3 RF: leverage _setAttribute, rename rng to randomNumberGenerator 2021-06-09 16:04:57 +01:00
Thomas Pronk
6c292ea2d9 RF: use seed getter and setter via _addAttribute 2021-06-09 14:32:52 +01:00
Thomas Pronk
148dda46ff BF: Make seedrandom work again
This bug-fix consists of modifications to util.shuffle and TrialHandler:
1) util.shuffle supports an optional second argument, rng, which defaults to Math.random
2) TrialHandler now has a getter and setter for the seed attrbute. On setting this attribute it constructs a random number generator (rng) using seedrandom using the seed provided. This rng is passed to to util.shuffle when preparing a sequence with method RANDOM or FULL_RANDOM
2021-06-09 13:57:28 +01:00
Alain Pitiot
bad98abde7
Merge pull request #378 from thewhodidthis/bf#318--textbox
visual/TextInput: use nullish coalescing operator for stroke styling fallbacks
2021-06-09 14:00:07 +02:00
Sotiri Bakagiannis
724177fd96
Merge pull request #381 from thewhodidthis/bf#379--preloadjs
Remove PreloadJS dependency
2021-06-09 12:30:52 +01:00
Sotiri Bakagiannis
5520382497 package: drop preloadjs from deps 2021-06-09 07:27:42 +01:00
Sotiri Bakagiannis
92d97f1f83 core/ServerManager: drop preloadjs import 2021-06-09 07:26:53 +01:00
Sotiri Bakagiannis
e2a9d08de8 visual/TextInput: use nullish coalescing operator for stroke styling
fallbacks
2021-06-08 19:03:17 +01:00
Sotiri Bakagiannis
4e08d1e26f
Merge pull request #375 from thewhodidthis/bf#374--lockfile
git/npm: tweak lock file
2021-06-08 15:00:51 +01:00
Sotiri Bakagiannis
b285283f9e git/npm: tweak lock file 2021-06-08 13:27:15 +01:00
Alain Pitiot
4bcf81d315
Merge pull request #372 from thewhodidthis/bf#367--movie-preload
package: bring back PreloadJS and import for side effects in core/ServerManager
2021-06-08 13:52:26 +02:00
Alain Pitiot
db9b6dd69e
Merge branch 'main' into bf#367--movie-preload 2021-06-08 13:52:21 +02:00
Sotiri Bakagiannis
3b4dd80e11
Merge pull request #368 from tpronk/test_ready
Make PsychoJS test-ready again
2021-06-07 22:46:19 +01:00
Thomas Pronk
d9c5f816ee Check more carefully whether the error properties exist 2021-06-07 12:17:16 +01:00
Sotiri Bakagiannis
e77688ce56 core/ServerManager: import PreloadJS for side effects 2021-06-07 11:38:13 +01:00
Sotiri Bakagiannis
c5545ca12d package: bring back the old PreloadJS, but from GH 2021-06-07 11:36:42 +01:00
Sotiri Bakagiannis
f532e739ae package: drop moment from deps 2021-06-04 11:57:26 +01:00
Sotiri Bakagiannis
4c1426dea5 util/Clock: split date formatting and parsing into separate funcs, drop moment import 2021-06-04 11:50:20 +01:00
Sotiri Bakagiannis
4ce8641639 Merge branch 'main' into bf#348--no-moment 2021-06-04 10:02:16 +01:00
Alain Pitiot
a27387e706
Merge pull request #365 from thewhodidthis/nf#364--target
scripts: override esbuild default target
2021-06-04 10:21:10 +02:00
Alain Pitiot
2bbdb6e299
Merge pull request #363 from thewhodidthis/bf#362--sourcemap
scripts: add sourcemap option for esbuild
2021-06-04 09:05:15 +02:00
Thomas Pronk
58e772698e RF: use log4javascript from Ritzlgrmft instead of tpronk 2021-06-03 18:19:11 +01:00
Thomas Pronk
f11e356653 RF: clean up improved error logging 2021-06-03 18:13:36 +01:00
Thomas Pronk
e1813c2e03 BF: properly log errors thrown by PsychoJS itself 2021-06-03 18:06:39 +01:00
tpronk
0a9fd0d831
BF: make psychopy/psychojs default repo 2021-06-03 12:35:13 +01:00
Thomas Pronk
9fa2d0e413 BF: workaround access denied, see description of this commit
https://github.com/actions/setup-node/issues/214
2021-06-03 12:28:46 +01:00
Thomas Pronk
28d90d0205 BF: workaround for permission denied error? 2021-06-03 12:20:00 +01:00
Thomas Pronk
2b0061f510 BF: Workaround for permission denied issue? 2021-06-03 12:16:06 +01:00
Sotiri Bakagiannis
6cb6d4d202 scripts: override esbuild default target 2021-06-03 12:07:34 +01:00
Thomas Pronk
ccfc44a4ce ENH: Add error logging for unhandled rejections 2021-06-03 11:56:34 +01:00
Thomas Pronk
8b3c04987c RF: Add correct version number 2021-06-03 11:56:00 +01:00