HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-10 10:40:54 +00:00
Code Actions Packages Releases Activity
844 Commits 51 Branches 0 Tags 15 MiB
main
Commit Graph

844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sotiri Bakagiannis
2d20c9303b data/TriaHandler: merge string type checking when parsing data rows 2021-02-15 14:43:37 +00:00
Sotiri Bakagiannis
98169cc6bf core/PsychoJS: tweak variable naming 2021-02-15 13:36:38 +00:00
Alain Pitiot
c5dee121c9
Merge pull request #125 from thewhodidthis/bf#124--duplicates 
data/ExperimentHandler: remove duplicate isEntryEmpty method
 2021-02-15 10:47:53 +01:00
Alain Pitiot
2e856a5851
Merge pull request #250 from thewhodidthis/bf#233--shape 
visual/ShapeStim: take contrast into account when calling beginFill
 2021-02-15 10:46:46 +01:00
Alain Pitiot
68c85f8460
Merge pull request #255 from thewhodidthis/bf#224--add-attributes 
core/data/sound/util: drop PsychObject._addAttributes() and refs thereof
 2021-02-15 10:13:51 +01:00
Alain Pitiot
eb35796416
Merge pull request #254 from thewhodidthis/bf#253--text-input 
visual/TextInput: replace for...in with a forEach loop
 2021-02-15 09:52:06 +01:00
Alain Pitiot
bfa460e419
Merge pull request #245 from thewhodidthis/bf#244--close-shape 
visual/ShapeStim: set closeStroke on PIXI polygon creation
 2021-02-15 09:50:51 +01:00
Alain Pitiot
ef98dc617f
Merge pull request #243 from nabaruns/master 
Update README.md
 2021-02-15 09:48:18 +01:00
Alain Pitiot
938832efcd
Merge pull request #264 from thewhodidthis/bf#69--slider 
visual/Slider: drop unused labelHeight attribute
 2021-02-15 09:34:56 +01:00
Alain Pitiot
8d8d38016b
Merge pull request #265 from thewhodidthis/bf#74--text-align 
visual/TextStim: fix jsdoc for alignHoriz
 2021-02-15 09:26:03 +01:00
Alain Pitiot
94bd840431
Merge pull request #266 from thewhodidthis/bf#167--beeping 
core/Keyboard: prevent default on keydown
 2021-02-15 09:24:53 +01:00
Alain Pitiot
8525eec3dc
Merge pull request #271 from thewhodidthis/bf#270--textbox 
visual/TextBox: implement autofocus
 2021-02-15 09:02:24 +01:00
Sijia Zhao
66a3dbdd41 BF: When closing DlgFromDict, call eventmanager.clearEvents to clear events accumulated during dialog to prevent subsequent routines picking up keypresses belonging to DlgFromDict 
Since DlgFromDict does not consume any events or keypresses, PsychoJS._keybuffer will be full of keypresses which may cause undesired outcomes when the experiment starts and the keypresses are processed.

Example bug-causing sequence:
- User presses ESC during DlgFromDict
- Nothing appears to happen (correct expected result)
- User completes the fields on DlgFromDict and presses Ok
- Next routine starts and then...

Bug behavior:
- User is unexpectedly presented with a "The [Escape] key was pressed. Goodbye!" dialog.

Correct behavior:
- Nothing should happen. ESC was pressed during the DIgFromDict, not this routine.

Reason the bug happens:
The ESC keypress during DlgFromDict was not consumed, so it is picked up by a [routine_name]RoutineEachFrame() in the scheduler, which checks for ESC keypresses, finds a ESC in the keybuffer, and unexpectedly stops the experiment.
 2021-02-12 03:17:36 +00:00
Sijia Zhao
575c54bfc0 Revert "BF: When closing DlgFromDict, call eventmanager.clearEvents to clear events accumulated during dialog" 
This reverts commit 42ebec383e.
 2021-02-12 03:13:25 +00:00
Sijia Zhao
42ebec383e BF: When closing DlgFromDict, call eventmanager.clearEvents to clear events accumulated during dialog 
Since DlgFromDict does not consume any events or keypresses, PsychoJS._keybuffer will be full of keypresses which may cause undesired outcomes when the experiment starts and the keypresses are processed.

Example bug-causing sequence:
- User presses ESC during DlgFromDict
- Nothing appears to happen (correct expected result)
- User completes the fields on DlgFromDict and presses Ok
- Next routine starts and then...

Bug behavior:
- User is unexpectedly presented with a "The [Escape] key was pressed. Goodbye!" dialog.

Correct behavior:
- Nothing should happen. ESC was pressed during the DIgFromDict, not this routine.

Reason the bug happens:
The ESC keypress during DlgFromDict was not consumed, so it is picked up by a [routine_name]RoutineEachFrame() in the scheduler, which checks for ESC keypresses, finds a ESC in the keybuffer, and unexpectedly stops the experiment.
 2021-02-12 03:09:50 +00:00
Sotiri Bakagiannis
3b92b1c962 visual/TextBox: implement autofocus 2021-02-04 17:16:41 +00:00
Sotiri Bakagiannis
f95e2ad9f3 visual/TextInput: prevent scroll by default if available when calling focus 2021-02-04 17:10:35 +00:00
Sotiri Bakagiannis
5408f4c2dd core/Window: implement getActualFrameRate, update monitorFramePeriod accordingly 2021-01-29 12:07:27 +00:00
Sotiri Bakagiannis
523dc2d006 util/Scheduler: store time delta for each rAF call 2021-01-29 12:06:18 +00:00
Sotiri Bakagiannis
69cfa73547 core/PsychoJS: enable whitelisting of config.json hosts other than pavlovia.org 2021-01-28 19:13:38 +00:00
Sotiri Bakagiannis
db637406f9 core/Keyboard: prevent default on keydown 2021-01-26 01:01:33 +00:00
Sotiri Bakagiannis
0434955623 visual/TextStim: fix jsdoc for alignHoriz 2021-01-25 23:48:25 +00:00
Sotiri Bakagiannis
1cc16f9381 visual/Slider: drop unused labelHeight attribute 2021-01-22 20:35:36 +00:00
Sotiri Bakagiannis
9b5938098f data/TrialHandler: clean up 2021-01-21 20:55:58 +00:00
Sotiri Bakagiannis
8ad1387084 util/Util: make turnSquareBracketsIntoArrays() easier to consume 2021-01-21 20:55:44 +00:00
Sotiri Bakagiannis
2d0066bd5e visual/ImageStim: match _updateIfNeeded() with MovieStim 2021-01-21 20:30:35 +00:00
Sotiri Bakagiannis
861c687a9e visual/MovieStim: clean up _updateIfNeeded() to avoid PIXI new and cache id warning 2021-01-21 20:29:46 +00:00
Sotiri Bakagiannis
32f4b83926 data/TrialHandler: clean up 2021-01-21 19:47:01 +00:00
Sotiri Bakagiannis
ec8963ff02 util/Util: tweak toNumerical() to accept array-like strings 
Also refactor turnSquareBracketsIntoArrays() to avoid
type coercion and return undefined if input invalid
 2021-01-21 19:45:21 +00:00
Sotiri Bakagiannis
106031937e visual/MovieStim: do tell PIXI base texture to respect autoplay 2021-01-20 23:43:38 +00:00
Sotiri Bakagiannis
3efd255786 core/data/sound/util: drop PsychObject._addAttributes() and refs thereof 2021-01-13 19:31:11 +00:00
Sotiri Bakagiannis
da375e0ace visual/TextInput: replace for...in with a forEach loop 2021-01-13 17:59:07 +00:00
Sotiri Bakagiannis
004a5c96ec core/GUI: use Object.keys() when iterating over e.g., expInfo in DlgFromDict 2021-01-11 14:51:11 +00:00
Sotiri Bakagiannis
baa17d9e95 data/TrialHandler: allow for doubly escaped LFs in xlsx cells 2021-01-08 16:51:11 +00:00
Sotiri Bakagiannis
b39e92ebfe visual/ShapeStim: take contrast into account when calling beginFill 2021-01-08 16:31:49 +00:00
Sotiri Bakagiannis
3ad6463f69 visual/Slider: estimate bounding box at the top of update calls 2021-01-08 16:22:41 +00:00
Sotiri Bakagiannis
141fab6348 data/TrialHandler: add FULLRANDOM alias to mirror PP output 2021-01-07 14:52:48 +00:00
Sotiri Bakagiannis
a9b94619a4 visual/ShapeStim: set closeStroke on PIXI polygon creation 2021-01-06 14:32:39 +00:00
Nabarun Sarkar
ba23dc1759
Update README.md 2020-12-24 10:59:39 +05:30
Alain Pitiot
cf0f2191f1
Merge pull request #240 from apitiot/master 
throttling of log messages (code only, will be activated in 2021), and __noOutput
 2020-12-23 16:35:46 +01:00
Alain Pitiot
c48aef093b __noOutput url parameter 2020-12-23 16:31:49 +01:00
Alain Pitiot
c22e089527 Merge remote-tracking branch 'upstream/master' 2020-12-23 15:24:48 +01:00
Alain Pitiot
6a41ea779c put in place throttling of log messages, to be activated soon 2020-12-23 15:14:33 +01:00
Alain Pitiot
c81013fd4e
Merge pull request #236 from thewhodidthis/bf#235--movie 
visual/MovieStim: add loop attribute
 2020-12-23 15:05:11 +01:00
Sotiri Bakagiannis
b70aec5095 visual/MovieStim: add loop attribute 2020-12-11 00:48:38 +00:00
Alain Pitiot
26cf59b047 Merge branch 'master' of github.com:psychopy/psychojs 2020-12-04 10:29:53 +01:00
Alain Pitiot
179cd0ef54 added experiment logging level 2020-12-04 10:29:50 +01:00
Alain Pitiot
c20c9f0883
Merge pull request #232 from thewhodidthis/bf#231--sound 
sound/TonePlayer: call toMaster on volumeNode if toDestination missing
 2020-12-04 10:25:52 +01:00
Sotiri Bakagiannis
72491aff3c sound/TonePlayer: call toMaster on volumeNode if toDestination missing 2020-12-03 20:56:02 +00:00
Alain Pitiot
c89d2ff91a small correction to PsychObject; corrected annoying change of focus in GUI; corrected bounding box issue with Slider 2020-12-01 10:48:43 +01:00