Becky Gilbert
|
3424f386ff
|
fix slider label positioning with custom track/thumb CSS & calc - fixes #695
|
2020-11-14 16:57:01 -08:00 |
|
Becky Gilbert
|
71ce1263f9
|
put button :hover in media query, add button :active style - #977
|
2020-10-29 15:55:49 -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
|
b02e73ea21
|
warn about .mov files - #649
|
2020-10-26 16:58:45 -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 |
|
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 |
|