HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-11 16:18:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,940 Commits 14 Branches 506 Tags 58 MiB
8104d356c5
Commit Graph

1940 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Becky Gilbert
8104d356c5 minor changes for clarity and consistency with other v6.2 plugins 2020-11-10 14:01:21 -08:00
Becky Gilbert
ece6e3b57e
Merge pull request #700 from cjungerius/feature/canvas 
Add canvas keyboard/button/slider plugins
 2020-11-09 15:38:50 -08:00
Becky Gilbert
c2ff15435c
Merge pull request #1145 from becky-gilbert/respond-while-playing 
Add response_allowed_while_playing parameter to audio/video plugins - fixes #1137
 2020-11-04 11:29:46 -08:00
Becky Gilbert
dbb001c0c7
Merge branch 'master' into respond-while-playing 2020-11-04 11:27:50 -08:00
Becky Gilbert
9822cfe2c9
Merge pull request #1162 from becky-gilbert/firefox-video-start 
Fix FF video issue with non-zero start time - fixes #712
 2020-11-04 11:08:17 -08:00
Becky Gilbert
879f6a7cb5 fix problem with non-zero video start time in FF 2020-10-31 15:37:27 -07:00
Becky Gilbert
ce50c6710c Merge branch 'master' of https://github.com/jspsych/jsPsych 2020-10-31 13:40:53 -07:00
Josh de Leeuw
a2b0cecfbb fixes Preloading progress bar not centered when experiment_width property is set in jsPsych.init #1160 2020-10-30 12:01:41 -04:00
Becky Gilbert
71ce1263f9 put button :hover in media query, add button :active style - #977 2020-10-29 15:55:49 -07:00
Becky Gilbert
4f8e59431d Merge branch 'master' of https://github.com/jspsych/jsPsych 2020-10-28 12:07:13 -07:00
Josh de Leeuw
d621710625
Merge pull request #948 from bjoluc/fix-duplicate-body 
Delay `init()` execution until the document is ready
 2020-10-28 11:49:28 -04:00
bjoluc
ffb9c5d39c add tests for delayed init() execution 2020-10-28 12:34:22 +01:00
bjoluc
2f421f4317 delay init() execution until the document is ready 
This prevents jsPsych from creating a duplicate `body` element when the
actual `body` element has not yet been initialized.

Fixes  #316
 2020-10-28 12:34:22 +01:00
Becky Gilbert
f16c9a54ee Merge branch 'master' of https://github.com/jspsych/jsPsych 2020-10-26 17:02:34 -07:00
Becky Gilbert
b02e73ea21 warn about .mov files - #649 2020-10-26 16:58:45 -07:00
Becky Gilbert
8b5a68edfc fix undefined starttime problem 2020-10-26 15:43:02 -07:00
Becky Gilbert
3787331df8 revert changes 2020-10-26 14:59:19 -07:00
Becky Gilbert
6396036c9e add response_allowed_while_playing parameter - #1137 2020-10-26 14:47:30 -07:00
Becky Gilbert
645102b8cb Merge branch 'master' of https://github.com/jspsych/jsPsych 2020-10-23 16:15:06 -07:00
Becky Gilbert
ac5c101c9d add minimum_valid_rt parameter to jspsych.init 2020-10-23 09:05:29 -07:00
Becky Gilbert
1be5f0b97f
Merge pull request #1139 from jspsych/min-rt 
Merges minimum valid RT changes into master
 2020-10-23 08:45:22 -07:00
Josh de Leeuw
b216b8f1e1 fixes test suite failure (== vs. === issues!) 2020-10-23 11:15:03 -04:00
Josh de Leeuw
0cbda8a76c adds a test for min-rt #546 2020-10-23 10:36:28 -04:00
Josh de Leeuw
a7916b8d33
Merge pull request #546 from andytwoods/min_RT 
minimum_valid_rt
 2020-10-23 10:13:59 -04:00
Josh de Leeuw
b364aa77cd trigger actions on all branches 2020-10-23 10:09:12 -04:00
Josh de Leeuw
eb08de2a43
Merge branch 'min-rt' into min_RT 2020-10-23 10:06:35 -04:00
Josh de Leeuw
b8ad672fb7 adds a test for #990 2020-10-22 11:33:31 -04:00
Josh de Leeuw
56a74ac745
Merge pull request #990 from egaudrain/master 
Patching for issue #989
 2020-10-22 11:32:30 -04:00
Becky Gilbert
719b009707 change require_movement so that clicking cursor is sufficient - fixes #696 2020-10-21 17:37:37 -07:00
Josh de Leeuw
fae00cb196 implement #664 and add test 2020-10-21 18:30:51 -04:00
Josh de Leeuw
e952dc7558 Merge branch 'master' of https://github.com/jspsych/jsPsych 2020-10-21 17:42:07 -04:00
Josh de Leeuw
de175d5d52 add error message when timeline is empty throw a useful error message when the timeline is empty #853 2020-10-21 17:41:53 -04:00
Becky Gilbert
b82ee3f6c9
Merge pull request #668 from alisdt/master 
note that input to submitToTurk must be non-empty
 2020-10-21 14:40:47 -07:00
Becky Gilbert
294aac623f change button_pressed data from string to int 2020-10-20 17:49:58 -07:00
Becky Gilbert
6efc5f26d5 change default stim duration params to null - fixes #755 2020-10-20 16:53:29 -07:00
Becky Gilbert
6a9f3575b6 update with changes to first/last functions 2020-10-20 16:17:39 -07:00
Becky Gilbert
790aafd8f3
Merge pull request #1115 from becky-gilbert/audio-bug 
Fixes #648 - bug with audio and progress bar
 2020-10-20 15:49:09 -07:00
Becky Gilbert
fc4ce1267a
Merge branch 'master' into audio-bug 2020-10-20 15:46:52 -07:00
Becky Gilbert
a513a922b1 fix incorrect HTML5 event names, remove loading event listeners after they fire 2020-10-20 15:37:42 -07:00
Becky Gilbert
b58cac1032 Revert "fix incorrect HTML5 audio event names, remove all event listeners after" 2020-10-20 15:32:37 -07:00
Becky Gilbert
d88a6a3e7d fix incorrect HTML5 audio event names, remove all event listeners after 
they fire
 2020-10-20 15:20:56 -07:00
Josh de Leeuw
94d4403be6
Merge pull request #1129 from becky-gilbert/timeline-tests 
New test for nested timelines with no other parameters
 2020-10-20 15:55:28 -04:00
Josh de Leeuw
3522a0c5a1
Merge pull request #1127 from becky-gilbert/image-plugin-tests 
New tests for image-button-response and image-keyboard-response
 2020-10-20 15:55:12 -04:00
Becky Gilbert
4d2cba7112 Merge branch 'master' of https://github.com/jspsych/jsPsych into image-plugin-tests 
sync with jspsych master
 2020-10-20 12:44:10 -07:00
Josh de Leeuw
559dac613e
Merge pull request #1126 from becky-gilbert/data-first-last-tests 
New tests for data collection .first and .last
 2020-10-20 15:43:52 -04:00
Josh de Leeuw
ff82d3878b
Merge branch 'master' into timeline-tests 2020-10-20 15:43:23 -04:00
Becky Gilbert
16e42d04e4 Merge branch 'master' of https://github.com/jspsych/jsPsych into data-first-last-tests 
sync with jspsych master
 2020-10-20 12:34:29 -07:00
Josh de Leeuw
099d2e10eb
Merge pull request #976 from aridyckovsky/issue-751 
Graceful failure on DataCollection.first and .last
 2020-10-20 15:31:38 -04:00
Becky Gilbert
d2a039f04b Merge branch 'master' of https://github.com/jspsych/jsPsych 
sync with jspsych master
 2020-10-20 12:25:33 -07:00
Josh de Leeuw
2ae596d473
Merge pull request #1125 from becky-gilbert/addNodeToEndOfTimeline-test 
Add node to end of timeline - new tests
 2020-10-20 15:13:13 -04:00