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

adjust getAutoPreloadList to work with timeline description

Browse Source
This commit is contained in:
Josh de Leeuw 2021-01-07 16:13:26 -05:00
parent 6135ed47d5
commit 3f1abdec88
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
jspsych.js
View File

@ -2514,6 +2514,22 @@ jsPsych.pluginAPI = (function() {
module.getAutoPreloadList = function(timeline_description){
function getTrialsOfTypeFromTimelineDescription(td, type){
var trials = [];
for(var i=0; i<td.length; i++){
var node = td[i];
if(node.type !== 'undefined' && node.type == type){
trials.push(node);
}
if(Array.isArray(node.timeline)){
trials = trials.concat(getTrialsOfTypeFromTimelineDescription(node.timeline, type));
}
}
return trials;
}
// list of items to preload
var images = [];
var audio = [];
@ -2524,21 +2540,21 @@ jsPsych.pluginAPI = (function() {
var type = preloads[i].plugin;
var param = preloads[i].parameter;
var media = preloads[i].media_type;
var trials = timeline.trialsOfType(type);
var trials = getTrialsOfTypeFromTimelineDescription(timeline_description, type);
for (var j = 0; j < trials.length; j++) {
if (typeof trials[j][param] == 'undefined') {
console.warn("jsPsych failed to auto preload one or more files:");
console.warn("no parameter called "+param+" in plugin "+type);
} else if (typeof trials[j][param] !== 'function') {
if ( !func || func(trials[j]) ){
if (media === 'image') {
images = images.concat(jsPsych.utils.flatten([trials[j][param]]));
} else if (media === 'audio') {
audio = audio.concat(jsPsych.utils.flatten([trials[j][param]]));
} else if (media === 'video') {
video = video.concat(jsPsych.utils.flatten([trials[j][param]]));
}
if (media === 'image') {
images = images.concat(jsPsych.utils.flatten([trials[j][param]]));
} else if (media === 'audio') {
audio = audio.concat(jsPsych.utils.flatten([trials[j][param]]));
} else if (media === 'video') {
video = video.concat(jsPsych.utils.flatten([trials[j][param]]));
}
}
}