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

10 Commits

Author SHA1 Message Date
Jon Peirce
100d72a394 Merge pull request #10 from jonathanoroberts/nreps_and_randomize
nReps and sequential/random/fullRandom
2017-06-02 11:18:23 +01:00
Jon Roberts
9cec1551c3 nReps and sequential/random/fullRandom
add psychoJS support for nReps and
sequential/random/fullRandom trial sequences.
Add columns from conditions files to data output.
Make loops marked as “isTrials” cause a data line
to be written each iteration. Add an “eventName”
column to the data file to identify whether a data
line was caused by a keyboard event or a loop iteration.
write out experiment data when quitPsychoJS() is called.

This commit goes with the one with the same name in the
psychopy project
2017-05-31 14:10:22 -06:00
Jon Peirce
9b7731de4c Merge pull request #9 from jonathanoroberts/keymapping
Modify getKeys to use most pyglet keynames
2017-05-18 21:04:28 +01:00
Jon Roberts
9ed64dc0fa Modify getKeys to use most pyglet keynames
Make keyDownHandler and getKeys give preference to
the use of the W3C standard keyboardEvent.code for
identifying keys pressed. The deprecated .keycode
attribute is still honored to allow older browsers
that do not support the .code attribute.

the keyList argument to getKeys should consist
of pyglet key names, allowing scripts created
using the builder to work in web experiments.
2017-05-18 11:04:27 -06:00
Jon Peirce
af3c9d7101 Merge pull request #7 from jonathanoroberts/KeyboardEvent.indentifier-deprecated
Use non-deprecated KeyboardEvent attributes
2017-05-10 21:39:55 +01:00
Jon Roberts
db48318de8 Use non-deprecated KeyboardEvent attributes
The KeyboardEvent.keyIdentifier and .keyCode attributes
have been deprecated. the .keyIdentifier attribute has
been replaced by the .key attribute.

Change keyDownHandler to use non-deprecated attributes
KeyboardEvent.code and KeyboardEvent.key.
Change getKeys to use these attributes to identify
which key was pressed.

keyList argument passed to getKeys can contain both
key codes, e.g. "KeyM" and "Space" and key values,
e.g. "m" and " ".
2017-05-10 13:29:41 -06:00
Jon Peirce
14f363ac9a Missing ; at end of line while setting nRemaining
(also my editor squelches blank space and makes EOLs uniform)
2017-04-06 15:36:22 +01:00
Jon Peirce
65667d241e Minor change to readme to check the submodule updates elsewhere 2017-04-05 11:29:47 +01:00
Jon Peirce
0d3ae2bd94 First commit to the new repository
Ilixa have developed this code as a part of the project psychopy/psychopy
but it is now being moved to its own space, with its own issues list and
a more permissive license
2017-04-05 10:56:12 +01:00
Jon Peirce
2130138d5b Initial commit 2017-04-05 10:49:12 +01:00