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 |
|
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 |
|
Josh de Leeuw
|
54dad43b7f
|
update jest to 26.6
|
2020-10-20 14:37:37 -04:00 |
|
Becky Gilbert
|
83a289b6c9
|
changed wording in console.warn
|
2020-10-19 17:31:33 -07:00 |
|
Becky Gilbert
|
dadf120f17
|
Merge pull request #1028 from chrisbrickhouse/1014
Warn about possible deadlock if response_ends_trial is false and trial_duration is null
|
2020-10-19 16:52:48 -07:00 |
|
Becky Gilbert
|
7f26d3fd3f
|
Merge pull request #971 from aridyckovsky/patch-1
Update package.json to reflect change from jodeleeuw to jspsych organization
|
2020-10-19 16:15:56 -07:00 |
|
Becky Gilbert
|
71cef75375
|
fixed missing array in timeline param
|
2020-10-18 14:46:19 -07:00 |
|
Becky Gilbert
|
9c659a53bf
|
new tests for nested timelines
|
2020-10-18 13:41:42 -07:00 |
|
Becky Gilbert
|
76946122e8
|
fixed console warn tests
|
2020-10-16 18:37:57 -07:00 |
|
Becky Gilbert
|
5050d636a4
|
added tests for trial deadlock
|
2020-10-16 18:03:02 -07:00 |
|
Becky Gilbert
|
b4c9a0b0d6
|
wrap expected errors in anonymous function
|
2020-10-16 17:14:22 -07:00 |
|
Becky Gilbert
|
2fefe75d90
|
fix syntax errors
|
2020-10-16 16:05:10 -07:00 |
|
Becky Gilbert
|
68f847faeb
|
new tests for .first and .last - #751
|
2020-10-16 15:41:52 -07:00 |
|
Becky Gilbert
|
9d9612888b
|
new tests for addNodeToEndOfTimeline
|
2020-10-15 17:33:33 -07:00 |
|
Becky Gilbert
|
a05fc287c0
|
Merge branch 'master' of https://github.com/jspsych/jsPsych into addNodeToEndOfTimeline-test
sync with jsPsych master
|
2020-10-15 17:14:34 -07:00 |
|
Becky Gilbert
|
c9237d33da
|
Merge pull request #690 from vijaymarupudi/master
Fix callback check typo in jsPsych.addNodeToEndOfTimeline; add video to registerPreload docs
|
2020-10-15 17:03:58 -07:00 |
|
Becky Gilbert
|
d6f3d79d04
|
revert fix for html5 audio progress bar - now in audio-bug branch
|
2020-10-12 17:55:48 -07:00 |
|
Becky Gilbert
|
ee228b1419
|
change timing_response to trial_duration - #1096
|
2020-10-12 12:36:21 -07:00 |
|
Becky Gilbert
|
1621169f82
|
use audio instead of this to remove event listener
|
2020-10-12 12:10:03 -07:00 |
|
Becky Gilbert
|
a63a749e3f
|
Merge branch 'master' of https://github.com/jspsych/jsPsych
sync master with upstream master
|
2020-10-12 09:37:51 -07:00 |
|
Becky Gilbert
|
7410fd01f0
|
fixes html5 audio progress bar error - #648
|
2020-10-11 17:15:13 -07:00 |
|
Becky Gilbert
|
d010376bb6
|
fix canvas positioning to get rid of scroll bars - #881
|
2020-10-11 14:55:04 -07:00 |
|
Becky Gilbert
|
e979129eaa
|
Merge pull request #677 from akochari/patch-1
Update trial type parameter in jspsych-same-different-html.md
|
2020-10-11 13:55:58 -07:00 |
|
Becky Gilbert
|
121428cf31
|
change start param to slider_start
|
2020-10-11 12:16:39 -07:00 |
|
Becky Gilbert
|
d236f028f0
|
changed slider response from string to numeric
|
2020-10-11 10:55:10 -07:00 |
|
Becky Gilbert
|
b3effcb015
|
fix inconsistencies in parameter info
|
2020-10-11 10:33:01 -07:00 |
|
Becky Gilbert
|
91f8350047
|
revert unintentional change
|
2020-10-11 10:27:35 -07:00 |
|
Becky Gilbert
|
f92b9214b5
|
fixed inconsistencies in parameter info
|
2020-10-11 10:26:10 -07:00 |
|
Becky Gilbert
|
66ca55478e
|
fixed broken link
|
2020-10-10 19:19:24 -07:00 |
|
Becky Gilbert
|
7e95a9b005
|
Merge pull request #676 from dillonplunkett/checkboxes-fix
return input elements to within label elements
|
2020-10-08 18:22:24 -07:00 |
|
Becky Gilbert
|
864093238b
|
Merge pull request #675 from hrcn/patch-2
initialize variable i in for loops
|
2020-10-08 18:04:32 -07:00 |
|
Becky Gilbert
|
1bc3ac337c
|
Merge pull request #721 from vijaymarupudi/html5-fix
Removed closing </link> tag
|
2020-10-08 17:20:25 -07:00 |
|
Becky Gilbert
|
c63d025f05
|
Merge pull request #694 from kachergis/master
corrected trial type in example
|
2020-10-08 17:04:00 -07:00 |
|
Becky Gilbert
|
55d0f31548
|
Merge pull request #701 from kurokida/master
Enable a survey-likert response selection by clicking label string
|
2020-10-08 16:47:57 -07:00 |
|
Becky Gilbert
|
d619ed1d64
|
Merge pull request #707 from vijaymarupudi/doc-fix
Updated to reflect that video preload is supported
|
2020-10-08 16:39:22 -07:00 |
|
Becky Gilbert
|
787b7bd0a5
|
Merge pull request #714 from vijaymarupudi/video-slider-fixes
fix start and slider_start parameters in video-slider-response plugin
|
2020-10-08 16:30:43 -07:00 |
|