From 4057fc8d88bc1dfb897fee1539552f6d218e2b89 Mon Sep 17 00:00:00 2001 From: Vijay Marupudi Date: Thu, 9 Apr 2020 12:05:39 -0500 Subject: [PATCH 1/2] Fixed undefined type check with typo --- jspsych.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jspsych.js b/jspsych.js index 922251da..53c06fe5 100755 --- a/jspsych.js +++ b/jspsych.js @@ -309,7 +309,7 @@ window.jsPsych = (function() { core.addNodeToEndOfTimeline = function(new_timeline, preload_callback){ timeline.insert(new_timeline); - if(typeof preload_callback !== 'undefinded'){ + if(typeof preload_callback !== 'undefined'){ if(opts.auto_preload){ jsPsych.pluginAPI.autoPreload(timeline, preload_callback); } else { From 0c33c8277e95506591a70826a1f695c78bace033 Mon Sep 17 00:00:00 2001 From: Vijay Marupudi Date: Tue, 19 May 2020 07:28:39 -0500 Subject: [PATCH 2/2] Updated to reflect that video preload is supported --- docs/core_library/jspsych-pluginAPI.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/core_library/jspsych-pluginAPI.md b/docs/core_library/jspsych-pluginAPI.md index 805b8294..074b1f81 100644 --- a/docs/core_library/jspsych-pluginAPI.md +++ b/docs/core_library/jspsych-pluginAPI.md @@ -458,7 +458,7 @@ Parameter | Type | Description ----------|------|------------ plugin_name | string | The name of the plugin. e.g., 'image-keyboard-response'. parameter | string | The name of the parameter that is a media file. e.g., 'stimulus' -media_type | string | The type of media, either 'image' or 'audio'. +media_type | string | The type of media, either 'image', 'audio' or 'video'. conditional_function | function | Only run the preload for a trial if this function returns true, or if this function does not exist. ### Return value