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

1661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh de Leeuw
501a5be52a update all to performance.now() - #492 2018-10-09 16:13:59 -04:00
Josh de Leeuw
6eeed765af make default progress bar amount 0 2018-10-09 13:51:24 -04:00
Josh de Leeuw
8b8d269665 add new progress bar tests 2018-10-09 13:50:59 -04:00
Josh de Leeuw
954eac9784 fix progress bar bug 2018-10-09 13:47:43 -04:00
Josh de Leeuw
0c4080fe81 update progress bar docs #538 2018-10-09 13:26:55 -04:00
Josh de Leeuw
6a6d390cb8 add get of progress bar value (#538) 2018-10-09 13:21:53 -04:00
Josh de Leeuw
59258d3215 implements #324 -- beforeunload event handler 2018-10-09 13:12:07 -04:00
Josh de Leeuw
540ce2ed6f step version 2018-10-04 15:31:37 -04:00
Josh de Leeuw
1c79b55740 remove form plugin test 2018-10-04 15:30:36 -04:00
Josh de Leeuw
f052f23633 remove form plugin 2018-10-04 15:27:33 -04:00
Josh de Leeuw
ea4196f764 minor comment formatting 2018-10-04 15:26:35 -04:00
Josh de Leeuw
cb030f3ed7
Merge pull request #564 from vrsivananda/add-RDK 
Added functionality for RDK to take in javascript character codes for…
 2018-10-04 15:23:52 -04:00
Josh de Leeuw
330e5a8611 add preventDefaul on captured key responses #548 2018-10-04 15:23:34 -04:00
Josh de Leeuw
f6b607f46f Merge branch 'master' of https://github.com/jspsych/jsPsych 2018-10-04 14:20:39 -04:00
Josh de Leeuw
7115ae7ed3 add test to validate #567 2018-10-04 14:20:30 -04:00
Josh de Leeuw
15d1bd4bae
Merge pull request #559 from tbrotherm/patch-1 
Update jspsych-external-html.js
 2018-10-04 14:08:48 -04:00
Josh de Leeuw
2e69a17693 update lexical decision to help test #563 2018-10-04 14:07:18 -04:00
Josh de Leeuw
299e9d7671 fix focus #563 2018-10-04 14:04:54 -04:00
Josh de Leeuw
7a08072070 scroll to top of DOM target at start of next trial #550 2018-10-04 13:55:08 -04:00
Josh de Leeuw
4bf2a6f643 Merge branch 'master' of https://github.com/jspsych/jsPsych 2018-10-04 13:44:41 -04:00
Josh de Leeuw
6b88af120e fix slider parameter type #571 2018-10-04 13:44:12 -04:00
CML2
3d708804b2 changed timing_post_trial to post_trial_gap 2018-09-20 13:31:55 -07:00
Josh de Leeuw
43a646599f
Merge pull request #566 from dillonplunkett/shuffleNoRepeats-fix 
make shuffleNoRepeats check last two elements
 2018-09-17 09:24:35 -04:00
Dillon Plunkett
da094d8a30 make shuffleNoRepeats check last two elements 2018-09-14 19:57:34 -04:00
CML2
b7e359510e Fixed bugs for backgroundColor and response_ends_trial 2018-09-13 14:30:48 -07:00
CML2
7a5c980cbf Added functionality for RDK to take in javascript character codes for choices and correct_choice parameters 2018-09-07 17:07:00 -07:00
Josh de Leeuw
c2bf4bb0aa fix title of plugin doc 2018-08-24 13:52:06 -04:00
Hitoshi Tominaga
4919c90ab1
Update jspsych-external-html.js 
I found a minor bug on line 69.
Error: if (trial.cont_key) { document.removeEventListener('keydown', key_listener); }
Correct: if (trial.cont_key) { display_element.removeEventListener('keydown', key_listener); }
Because of this, some eventListeners continue working after finishing this plugin.
 2018-08-22 19:14:00 +09:00
Josh de Leeuw
6eb7ec21ac fix #557 by removing 0s, nulls, and false values from preload arrays 2018-08-15 09:46:57 -04:00
Josh de Leeuw
b85c5e754e fix additional bug in #553 2018-08-01 15:47:11 -04:00
Josh de Leeuw
1b7272e5de fix bug with backward button in instructions plugin (fixes #553) 2018-08-01 15:32:44 -04:00
Josh de Leeuw
0b5b3004de implement async option for call-function plugin #552 2018-07-31 10:48:54 -04:00
Josh de Leeuw
6f3d1f6d80 fix missing RDK page in docs 2018-07-20 11:29:27 -04:00
Josh de Leeuw
3d4b48a15c Merge branch 'master' of https://github.com/jspsych/jsPsych 2018-07-16 12:14:28 -04:00
Josh de Leeuw
9accc0f060 patch documentation issue 2018-07-16 12:14:09 -04:00
Josh de Leeuw
db054ba9c7
Merge pull request #547 from guydav/master 
CSS imports must be at beginning of file.
 2018-07-03 15:33:59 -04:00
Guy Davidson
4df9c11388 CSS imports must be at beginning of file. 
As it's currently written, the Open Sans font is never being loaded. See, for instance, https://developer.mozilla.org/en-US/docs/Web/CSS/@import
 2018-07-03 15:11:29 -04:00
Josh de Leeuw
b9a796211e step version 2018-06-25 22:10:58 -04:00
Josh de Leeuw
25d23a8e0d adding RDK plugin 2018-06-25 22:08:47 -04:00
Josh de Leeuw
fe29d2b255
Merge pull request #491 from vrsivananda/add-RDK 
Added RDK plugin
 2018-06-25 22:02:19 -04:00
Josh de Leeuw
d96252b157
Merge pull request #501 from mjaquiery/instruction-pagenum 
Instruction page numbers (feature requested in #371)
 2018-06-25 21:51:06 -04:00
Josh de Leeuw
fe74cdefbf update docs for #537 2018-06-25 21:48:57 -04:00
Josh de Leeuw
b6009b2de9 docs for #532 2018-06-25 21:37:32 -04:00
Josh de Leeuw
3c73ed41fd
Merge pull request #534 from onkeltom/fix-external-html-plugin 
Fix #532 to allow script on external-html pages to be executed
 2018-06-25 21:34:55 -04:00
Josh de Leeuw
2970c94559 fixes #539 2018-06-25 21:33:39 -04:00
Josh de Leeuw
176424df82 fixes #545 2018-06-25 15:39:40 -04:00
Josh de Leeuw
0f92127a49 fixes #541 by moving current_trial_finished to better location 2018-06-25 15:33:29 -04:00
Josh de Leeuw
0b1b5c3cf9 add test for jsPsych.endExperiment() 2018-06-25 15:18:40 -04:00
Josh de Leeuw
c112f930c1 relocate tests on core library 2018-06-25 15:18:23 -04:00
Josh de Leeuw
243c49dc74 fixes #544 2018-06-25 14:42:40 -04:00