Commit Graph

2071 Commits

Author SHA1 Message Date
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
Becky Gilbert
b81193756a changed timing_response to trial_duration 2020-10-02 14:40:45 -07:00
Becky Gilbert
72a0c539e5 add slider start value to data generated 2020-10-02 14:27:39 -07:00
Becky Gilbert
f1c2bd35cf revert docs update that was moved to docs-6.2 branch 2020-10-02 14:15:59 -07:00
Becky Gilbert
dd543cff96 fix typo 2020-10-02 14:13:25 -07:00
Becky Gilbert
09a8a4578e sync with docs changed via PR merged into master 2020-10-02 14:08:52 -07:00
Becky Gilbert
f2b49939da add autocomplete parameter 2020-10-02 14:03:13 -07:00
Becky Gilbert
8e5af0e356 add autofocus parameter and example 2020-10-02 13:56:29 -07:00
Becky Gilbert
d612a90f4f fix typo 2020-10-02 11:41:59 -07:00
Becky Gilbert
a891526e89 edit formatting 2020-10-02 11:39:44 -07:00
Becky Gilbert
c1dc2295ad Merge branch 'master' of https://github.com/jspsych/jsPsych 2020-10-02 11:36:27 -07:00
Becky Gilbert
ae3aafd6ec fix formatting 2020-10-02 11:36:16 -07:00
Becky Gilbert
402d4f0d8f
Merge pull request #1072 from chrisbrickhouse/Iss-1062
survey-html-form: add autofocus parameter
2020-10-02 11:35:37 -07:00
Becky Gilbert
4d82286e98 added CB 2020-10-02 11:04:21 -07:00
Becky Gilbert
f99048a0e2 change autofocus to autocomplete 2020-10-02 11:02:51 -07:00
Becky Gilbert
b96a875d30
Merge pull request #1073 from chrisbrickhouse/Iss-1064
survey-*: default to autocomplete=off and add param to enable
2020-10-02 11:00:23 -07:00
Christian
ebb6fce877
survey-html-form: validate autofocus parameter
When the autofocus parameter is set, check that
the specified element exists in the DOM and
check that the specified ID is unique. If there
is not exactly 1 element with the given ID, warn
the user about unexpected behavior.
2020-10-01 19:45:49 -07:00
Christian
11291625ff
survey-*: stop autocomplete add param to enable
Add an autocomplete parameter to the html form plugin
series. When autocomplete is set to true, the <form>
tag added by the survey-* plugin will behave as before.
When not defined or set to false, the <form> tag is
given the autocomplete="off" attribute and value.
2020-10-01 19:09:49 -07:00
Becky Gilbert
9dfa38852d added GJ 2020-10-01 17:01:03 -07:00
Becky Gilbert
bc2809b3f1 remove files that were unintentionally added in PR 2020-10-01 16:58:06 -07:00
Becky Gilbert
55e581fff4 add missing parameters heading and text 2020-10-01 16:55:30 -07:00
Becky Gilbert
36df451b08
Merge pull request #1081 from GEJ1/instructions
Instructions plugin changes: add page_label parameter to plugin and docs, add show_page_number parameter to docs
2020-10-01 16:52:28 -07:00
Gustavo Juantorena
293338172f Addded page_label to plugin jspsych-instructions also changed docs 2020-09-27 14:07:14 -03:00
Gustavo Juantorena
49f68b7b7e Revert "Addded page_labe to plugin.info also changed docs"
This reverts commit ada7afbf89.
2020-09-27 03:44:35 -03:00
Gustavo Juantorena
ada7afbf89 Addded page_labe to plugin.info also changed docs 2020-09-27 03:05:35 -03:00
Gustavo Juantorena
a96721272d starting the documentation for virtual chin rest plugin 2020-09-25 20:12:13 -03:00
Gustavo Juantorena
e1ec9852c8 Fixed problem going to next trial 2020-09-25 19:11:29 -03:00
Christian
47e6080d63
survey-*: stop autocomplete add param to enable
Excludes survey-multi-select since it's highly
specialized and the parameter doesn't really
apply to it.

Issue #1064
2020-09-23 21:47:15 -07:00
Christian
8d8ee8ae55
survey-html-form: add autofocus parameter
Users can provide the id of an element to focus on when the
slide is displayed. While HTML5 has an autofocus parameter
it is not universal and not all browsers support it. This
solution should work across browsers and is more in keeping
with the jsPsych object style.

Issue #1062
2020-09-23 21:05:42 -07:00
Becky Gilbert
a095e81fad fix prompt bug 2020-09-16 18:15:32 -07:00
Becky Gilbert
657418ba20
Merge pull request #736 from kupiqu/save_stimulus_start_slider
systematically saving stimulus and slider start position in all slider plugins
2020-09-16 17:25:23 -07:00
Christian
e9735c6137
Fix test failures. 2020-09-03 18:28:07 -07:00
Christian
36f637ed6e
Warn about possible deadlock per #1014
If no duration is set and a response does not end the trial, then
the trial will never end and the experiment is deadlocked. Users
will be warned about this situation and given hints on how to
fix it.
2020-09-03 18:13:35 -07:00
Gustavo Juantorena
c515d43c0d virtual chin plugin 2020-08-31 17:54:23 -03:00
Gustavo Juantorena
47726004cb jsPsych-virtual-chin-rest.js new plugin 2020-08-31 17:36:08 -03:00
Peter J. Kohler
5740d0a316 added my name to contributors 2020-08-30 10:41:19 -04:00
Peter J. Kohler
c2132ab4d7 updated free-sort docs 2020-08-29 17:13:05 -04:00
Peter J. Kohler
3e752a73f8 updated free-sort-example 2020-08-29 17:08:38 -04:00
Peter J. Kohler
92b6c2e78e updates to free-sort plugin, new functionality 2020-08-29 14:55:25 -04:00
Becky Gilbert
5efd4cba32 Merge remote-tracking branch 'upstream/master'
syncing with main jspsych repo
2020-08-20 17:01:57 -07:00
Becky Gilbert
83d43d0f02 Merge branch 'master' of https://github.com/becky-gilbert/jsPsych
Pull PRs from GitHub.
2020-08-20 16:50:09 -07:00
Becky Gilbert
c9ab05fac9
Merge pull request #3 from becky-gilbert/revert-2-master
Revert "adding new plugins"
2020-08-20 16:27:06 -07:00
Becky Gilbert
7dc91152f1
Merge pull request #995 from becky-gilbert/revert-2-master
Revert 2 master
2020-08-20 16:13:33 -07:00
Becky Gilbert
6e845754a1
Revert "adding new plugins" 2020-08-20 16:10:31 -07:00