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

254 Commits

Author SHA1 Message Date
Josh de Leeuw
5ad4e4c9a4 implement #349 2017-03-19 16:38:59 -04:00
Josh de Leeuw
f941731a5b #334 add data collection method .uniqueNames 2017-02-04 16:05:22 -05:00
Josh de Leeuw
065fd8d4b0 change jsPsych.data.getData() to jsPsych.data.get() 2017-02-02 16:47:35 -05:00
Josh de Leeuw
12043f2ffc Merge pull request #289 from rivasd/parallelport 
Changes for supporting parallel port triggers with our Chrome extension
 2017-01-18 12:55:52 -05:00
Josh de Leeuw
ba356b6588 change execution order of finishExperiment 2017-01-17 15:07:23 -05:00
Rob Wilkinson
15016febc6 cleaned up console logs 2017-01-13 17:49:27 -08:00
Xiaolu Bai
467dcb0460 bugfix_multiple_choice_module 2017-01-13 01:57:04 -08:00
Josh de Leeuw
f40214066b pretty print json; fix #318; adjust timelineVaribale to return function by default 2017-01-12 14:43:38 -05:00
Josh de Leeuw
accc619352 trial finish events get passed a modifiable copy of the raw data object 2017-01-09 11:30:23 -05:00
Josh de Leeuw
4fc383cab1 manual preloading from init method 2017-01-04 15:25:01 -05:00
Josh de Leeuw
354ff1dc94 add DataCollection.first and .last 2016-12-31 14:39:53 -05:00
Josh de Leeuw
e821ae6bb0 add DataColumn.all 2016-12-31 14:19:51 -05:00
Josh de Leeuw
7a966c2248 add ConvertKeyCodeToKeyCharacter, variance, min, max 2016-12-22 17:00:48 -05:00
Josh de Leeuw
658b1db363 implement pluginapi tests 2016-12-20 13:21:13 -05:00
Josh de Leeuw
72deca2348 centralize keyboard listeners for better held_key detection 2016-12-20 11:28:24 -05:00
Josh de Leeuw
f7b917adaa replace .which with .keyCode 2016-12-20 10:38:20 -05:00
Josh de Leeuw
2d46484365 fixes audio load bug #308 2016-12-20 09:24:53 -05:00
Josh de Leeuw
db8730d4b3 testing and fixing data module 2016-12-18 11:31:35 -05:00
Josh de Leeuw
347c7d0a66 fix DataCollection bugs 2016-12-17 15:40:19 -05:00
Josh de Leeuw
979ee70d58 fix addToAll, test it 2016-12-16 14:00:15 -05:00
Josh de Leeuw
66fea32f5b don't reset data properties 2016-12-16 13:33:19 -05:00
Josh de Leeuw
099c1da963 remove ref to ignored data 2016-12-16 11:26:00 -05:00
Josh de Leeuw
05b255dc5c reset data storage if .init() is called. 2016-12-16 11:10:48 -05:00
Josh de Leeuw
d7d6d5b971 test addProperties 2016-12-16 11:05:47 -05:00
Josh de Leeuw
f125065451 fix ^ -> Math.pow() 2016-12-15 22:18:22 -05:00
Josh de Leeuw
788ea0833b fix sqrt() 2016-12-15 22:08:43 -05:00
Josh de Leeuw
30a7401e92 missing .length 2016-12-15 21:59:29 -05:00
Josh de Leeuw
c8ff0ad884 bug 2016-12-15 21:56:56 -05:00
Josh de Leeuw
c1fbe542df datacollection tests 2016-12-15 21:53:52 -05:00
Josh de Leeuw
7806cd14e6 More changes to how data is handled... 2016-12-15 21:38:22 -05:00
Josh de Leeuw
22cc5bf878 DataCollection and DataColumn, breaks code for now. 2016-12-15 15:13:18 -05:00
Josh de Leeuw
41cd3e87a7 don't remove DOM element when adding progress bar! 2016-12-15 11:29:23 -05:00
Josh de Leeuw
4e95436a58 changes default_iti #312 2016-12-14 13:53:39 -05:00
Josh de Leeuw
1c60540396 html5 fallback for webaudio #311 2016-12-14 12:16:07 -05:00
Josh de Leeuw
df49035118 first jest test runs! 2016-12-09 21:25:56 -05:00
Josh de Leeuw
7b099b39ee demo rt experiment seems to work... 2016-11-25 15:22:16 -05:00
Josh de Leeuw
2f6db7a603 no refs to jquery in main library 2016-11-24 01:12:39 -05:00
Josh de Leeuw
920e4fd5e0 removing some $ 2016-11-23 12:42:29 -05:00
Josh de Leeuw
5048bca4cb starting to implement. 2016-11-18 15:16:42 -05:00
Daniel Rivas
af133eb79f Adds DOM trace without jQuery 2016-09-08 11:58:48 -04:00
Daniel Rivas
5d00e36111 Preparing Chrome extension support for hardware 
- init function now declares a "jspsych" attribute on the <html> element
so that our Chrome Extension can tell when jsPsych is loaded on a page

- new method jsPsych.pluginAPI.hardware that dispatches an event caught
by our extension. allows sending triggers to the parallel port!
 2016-09-07 18:17:29 -04:00
Josh de Leeuw
a2e9f8674c progress bar fixes 2016-08-16 11:16:14 -04:00
Josh de Leeuw
0bdfd39702 fixes #285 2016-08-15 23:58:13 -04:00
Josh de Leeuw
17f0aa6fa0 fixes #284 2016-08-15 23:48:02 -04:00
Josh de Leeuw
bb7009e374 fix indexing bug 2016-08-15 18:34:47 -04:00
Josh de Leeuw
3cfde8a504 remove data.getTrialsOfType and data.getDataByTrialIndex 2016-08-15 18:02:43 -04:00
Josh de Leeuw
e46b84941f begin implementing data filters #283 2016-08-15 17:17:43 -04:00
Josh de Leeuw
0128e74540 error message if display_element does not exist 2016-08-15 16:29:30 -04:00
Josh de Leeuw
2efa5fefeb CSS rules for vertical centering 2016-08-12 16:54:15 -04:00
Josh de Leeuw
606600598c implements features for #281 2016-08-10 16:58:30 -04:00