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
347 Commits 14 Branches 506 Tags 58 MiB
12118247b1
Commit Graph

347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh de Leeuw
12118247b1 add progress bar option 
Can now pass ‘show_progress_bar: true’ to init method to display a
progress bar throughout the experiment.

* default styling has been added to jspsych.css for the progress bar
* bug fixes to jspsych.progress method to support this change (bug was
related to getting progress after experiment had ended)
* improved logic for when on_finish_trial callback function will trigger
 2014-09-10 10:15:13 -04:00
Josh de Leeuw
7c1da93010 enforce array for continue key 2014-09-10 09:33:04 -04:00
Josh de Leeuw
2d9af8dfa9 clean formatting, remove redundant data 2014-09-09 08:36:39 -04:00
Josh de Leeuw
2c33d7603d add block_index to default data 
records the index of the current block
 2014-09-09 08:32:12 -04:00
Josh de Leeuw
146d1dae20 add time_elapsed to default data 
records the number of ms since the start of the experiment when a trial ends.
 2014-09-09 08:28:52 -04:00
Josh de Leeuw
8db4ea307e add default data for all trials 
records default data for all trials:

- trial type
- trial index within the block
- trial index for entire experiment (global index -- related to issue #63)
 2014-09-08 15:22:17 -04:00
Josh de Leeuw
a07f59d323 namespace bug 2014-09-03 14:19:24 -04:00
Josh de Leeuw
03ce248d0b Fixed bugs when timing_response was > 0 
Related to Issue #62.

Also, explicitly canceled keyboard listener in cases where trial ended and participant didn't respond.
 2014-09-02 10:17:07 -04:00
Josh de Leeuw
3e96600423 remove unnecessary startTime record 2014-07-27 11:05:16 -04:00
Josh de Leeuw
81248f7d61 Merge pull request #61 from jodeleeuw/master 
merge master to dev
 2014-07-27 10:49:30 -04:00
Josh de Leeuw
655d5cef91 bug fix other " 2014-07-22 07:15:12 -04:00
Josh de Leeuw
05df09502e bug missing " 2014-07-22 06:40:47 -04:00
Josh de Leeuw
ada763ce3b Merge pull request #60 from jodeleeuw/dev 
update to v3.1
 2014-07-16 13:47:48 -04:00
Josh de Leeuw
26052c22a1 remove append_data 2014-07-10 12:14:05 -04:00
Josh de Leeuw
fdf77c79dd make json pretty 2014-07-10 12:03:51 -04:00
Josh de Leeuw
fc16067939 add getter method for DOM_target, update module methods 2014-07-10 12:00:56 -04:00
Josh de Leeuw
8d3d9af0db bug fix flatten_data -> flattenData 2014-07-10 11:49:40 -04:00
Josh de Leeuw
594be10e52 add dataAPI.displayData 2014-07-10 11:45:01 -04:00
Josh de Leeuw
a340f9c7ef Merge pull request #59 from jodeleeuw/css 
Css
 2014-07-09 12:01:47 -04:00
Josh de Leeuw
351542dc6c bug fixes with size and location of raphael canvas 
also, show fixation throughout entire trial
 2014-07-06 22:46:14 -04:00
Josh de Leeuw
a0113f70ea add jsPsych email group 2014-07-06 14:06:27 -04:00
Josh de Leeuw
9fe361306d add a few plugins 2014-07-04 20:57:12 -04:00
Josh de Leeuw
5acb0aba9b add class info for left/right 2014-07-04 20:53:41 -04:00
Josh de Leeuw
c5fda9fad0 Create jspsych.css 2014-07-04 17:06:12 -04:00
Josh de Leeuw
c7e4050e94 change css info 2014-07-04 16:57:28 -04:00
Josh de Leeuw
bd5a97fee2 change class of image 2014-07-04 16:53:16 -04:00
Josh de Leeuw
b7a658e825 Merge pull request #58 from jodeleeuw/visual-search-circle 
Visual search circle
 2014-07-04 16:20:59 -04:00
Josh de Leeuw
35deb1935b update header 2014-07-04 16:19:45 -04:00
Josh de Leeuw
3d00c7b59a assorted bug fixes from testing 2014-07-04 16:19:23 -04:00
Josh de Leeuw
959447be1e move flatten function 2014-07-04 16:04:36 -04:00
Josh de Leeuw
8b7a5858d1 generalizes to any set size 2014-07-04 11:47:47 -04:00
Josh de Leeuw
8ae2e2b3bb starting to generalize beyond fixed set sizes 2014-07-04 11:35:31 -04:00
Josh de Leeuw
fcb6c51d95 use getKeyboardResponse 2014-07-03 10:05:59 -04:00
Josh de Leeuw
0a965ebfe5 Create jspsych-visual-search-circle.js 2014-07-03 09:56:10 -04:00
Josh de Leeuw
3e8fb4f780 change header doc 2014-07-01 11:08:48 -04:00
Josh de Leeuw
11f644f6a6 add dataAPI.getTrialsOfType 2014-07-01 11:05:40 -04:00
Josh de Leeuw
107ca90748 a few unrelated bug fixes 2014-06-30 14:19:51 -04:00
Josh de Leeuw
ebd50e7726 replace core with module 2014-06-30 09:47:23 -04:00
Josh de Leeuw
e656894011 move getKeys to the right module 2014-06-30 09:46:32 -04:00
Josh de Leeuw
3b184648fd missing ) 2014-06-30 09:43:47 -04:00
Josh de Leeuw
5a2140264d remove extra } 2014-06-30 09:42:11 -04:00
Josh de Leeuw
2befa81411 change $.unbind to $.off 2014-06-30 09:36:33 -04:00
Josh de Leeuw
94446016ae require key to be released before continuing in getKeyboardResponse 2014-06-30 09:33:12 -04:00
Josh de Leeuw
3c70abc3aa use enforceArray and update namespace of pluginAPI 2014-06-29 21:56:40 -04:00
Josh de Leeuw
3038c25299 use enforceArray and update namespace of pluginAPI 2014-06-29 21:54:54 -04:00
Josh de Leeuw
34af08a74c update namespace of pluginAPI 2014-06-29 21:53:40 -04:00
Josh de Leeuw
88dca27536 use enforceArray and update namespace of pluginAPI 2014-06-29 21:52:25 -04:00
Josh de Leeuw
d9c2e9d1f0 use enforceArray and update namespace of pluginAPI 2014-06-29 21:51:27 -04:00
Josh de Leeuw
f254dc70ad use enforceArray and update namespace of pluginAPI 2014-06-29 21:50:11 -04:00
Josh de Leeuw
903980f413 use enforceArray and update namespace of pluginAPI 2014-06-29 21:42:17 -04:00