HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-11 16:18:10 +00:00
Code Actions Packages Releases Activity
521 Commits 51 Branches 0 Tags 15 MiB
d9c587b34e
Commit Graph

521 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alain Pitiot
d9c587b34e updated documentation; added jsdoc configuration file 2021-06-21 07:38:07 +02:00
Alain Pitiot
8b15ac5fcc try and keep the size of the licensee logo reasonable in the pop up experiment window 2021-06-21 07:08:53 +02:00
Alain Pitiot
2c3e571193 minor corrections to TrialHandler.setSeed 2021-06-21 07:06:22 +02:00
Alain Pitiot
fc80e8ade9 added skeleton of AudioClip Player 2021-06-18 16:55:34 +02:00
Sotiri Bakagiannis
b8956f5c4f
Merge pull request #394 from thewhodidthis/bf#322--slider 
Do support Form.Types.SLIDER
 2021-06-16 16:11:54 +01:00
Alain Pitiot
9cecf2984f
Merge pull request #406 from thewhodidthis/bf#404--textbox 
visual/TextBox: add clear method, tweak reset to take editable into account
 2021-06-15 19:28:34 +02:00
Alain Pitiot
f4000ca0ee
Merge pull request #405 from thewhodidthis/bf#401--slider 
visual/Slider: add lineColor option, borderColor alias
 2021-06-15 19:26:07 +02:00
Sotiri Bakagiannis
25a49771e5 visual/TextBox: add clear method, tweak reset to take editable into account 2021-06-15 17:13:19 +01:00
Sotiri Bakagiannis
c41554c1ef visual/Slider: add lineColor option, borderColor alias 2021-06-15 16:24:00 +01:00
Thomas Pronk
3c807ec363 RF: Could not get this action to work quickly enough 2021-06-15 15:44:38 +01:00
Thomas Pronk
dfbfca8d47 BF: fix name of workflow 2021-06-15 15:31:03 +01:00
Thomas Pronk
abcc11adf5 BF: remove skipping library building 2021-06-15 15:29:36 +01:00
Thomas Pronk
dd338892d1 ENH: A quick attempt at compiling and deploying a test-experiment via GH actions 
This is so that the PsychoPy team can test the code generation independently
 2021-06-15 15:28:50 +01:00
Alain Pitiot
9ced77d1ec
Merge pull request #403 from apitiot/master 
getSnapshot / fromSnapshot now also store/restore TrialHandler's trial attributes
 2021-06-15 16:17:51 +02:00
Alain Pitiot
7a9cdcfd27 Merge branch 'psychopy:main' into master 2021-06-15 16:15:46 +02:00
Alain Pitiot
56fbb0e29d Merge branch 'master' of github.com:apitiot/psychojs 2021-06-15 16:11:45 +02:00
Alain Pitiot
198becd71e getSnapshot / fromSnapshot now also store/restore the trial attributes 2021-06-15 16:11:33 +02:00
Alain Pitiot
6cd6135ce7
Merge pull request #402 from thewhodidthis/bf#395--text-input 
visual/TextBox/TextInput: only disable text substitution when multiline
 2021-06-15 15:35:25 +02:00
Sotiri Bakagiannis
e868f941f9 visual/TextInput: access a text value, only disable text substitution when multiline 2021-06-15 14:33:07 +01:00
Sotiri Bakagiannis
d3e3a67a80 visual/TextBox: pass text value on to text input 2021-06-15 14:32:23 +01:00
Alain Pitiot
71f1576e84
Merge pull request #352 from thewhodidthis/bf#348--no-moment 
util/Clock: drop moment and the format argument from getDateStr()
 2021-06-15 14:49:18 +02:00
Alain Pitiot
6ecb96b561
Merge branch 'main' into bf#348--no-moment 2021-06-15 14:49:10 +02:00
Alain Pitiot
0a2ce3d167
Merge pull request #400 from apitiot/master 
change the Microphone API to be consistent with the other Stimuli, i.e. passing Window instead of PsychoJS; handled transcription error in AudioClip
 2021-06-15 11:17:23 +02:00
Alain Pitiot
87d6d7fde6 Merge branch 'psychopy:main' into master 2021-06-15 11:16:08 +02:00
Alain Pitiot
3d9eb73840 changed the API of Microphone to be consistent with the other Stimuli, i.e. passing Window instead of PsychoJS; handled transcription error in AudioClip 2021-06-15 11:15:50 +02:00
Sotiri Bakagiannis
77cdfa9646 visual/Form: clean up slider options merging 2021-06-11 20:57:51 +01:00
Sotiri Bakagiannis
f372162553 visual/Form: add granularity per item override 2021-06-11 20:45:53 +01:00
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