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

remove the conditional_function option from registerPreload

Browse Source
This commit is contained in:
Josh de Leeuw 2021-01-07 16:06:48 -05:00
parent e892d58e2e
commit 6135ed47d5
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jspsych.js
View File

@ -2498,7 +2498,7 @@ jsPsych.pluginAPI = (function() {
};
module.registerPreload = function(plugin_name, parameter, media_type, conditional_function) {
module.registerPreload = function(plugin_name, parameter, media_type) {
if (['audio', 'image', 'video'].indexOf(media_type)===-1) {
console.error('Invalid media_type parameter for jsPsych.pluginAPI.registerPreload. Please check the plugin file.');
}
@ -2506,26 +2506,24 @@ jsPsych.pluginAPI = (function() {
var preload = {
plugin: plugin_name,
parameter: parameter,
media_type: media_type,
conditional_function: conditional_function
media_type: media_type
}
preloads.push(preload);
}
module.getAutoPreloadList = function(timeline){
module.getAutoPreloadList = function(timeline_description){
// list of items to preload
images = images || [];
audio = audio || [];
video = video || [];
var images = [];
var audio = [];
var video = [];
// construct list
for (var i = 0; i < preloads.length; i++) {
var type = preloads[i].plugin;
var param = preloads[i].parameter;
var media = preloads[i].media_type;
var func = preloads[i].conditional_function;
var trials = timeline.trialsOfType(type);
for (var j = 0; j < trials.length; j++) {