mirror of
https://github.com/jspsych/jsPsych.git
synced 2025-05-12 08:38:11 +00:00
fix bug
This commit is contained in:
Josh de Leeuw
parent
4e2fb7c8e5
commit
1218c58350
@ -9,216 +9,215 @@
|
||||
*/
|
||||
|
||||
(function($) {
|
||||
jsPsych.similarity = (function() {
|
||||
jsPsych.similarity = (function() {
|
||||
|
||||
var plugin = {};
|
||||
var plugin = {};
|
||||
|
||||
plugin.create = function(params) {
|
||||
plugin.create = function(params) {
|
||||
|
||||
jsPsych.pluginAPI.enforceArray(params, ['data']);
|
||||
jsPsych.pluginAPI.enforceArray(params, ['data']);
|
||||
|
||||
var trials = new Array(params.stimuli.length);
|
||||
for (var i = 0; i < trials.length; i++) {
|
||||
trials[i] = {};
|
||||
trials[i].a_path = params.stimuli[i][0];
|
||||
trials[i].b_path = params.stimuli[i][1];
|
||||
trials[i].labels = (typeof params.labels === 'undefined') ? ["Not at all similar", "Identical"] : params.labels;
|
||||
trials[i].intervals = params.intervals || 100;
|
||||
trials[i].show_ticks = (typeof params.show_ticks === 'undefined') ? false : params.show_ticks;
|
||||
var trials = new Array(params.stimuli.length);
|
||||
for (var i = 0; i < trials.length; i++) {
|
||||
trials[i] = {};
|
||||
trials[i].a_path = params.stimuli[i][0];
|
||||
trials[i].b_path = params.stimuli[i][1];
|
||||
trials[i].labels = (typeof params.labels === 'undefined') ? ["Not at all similar", "Identical"] : params.labels;
|
||||
trials[i].intervals = params.intervals || 100;
|
||||
trials[i].show_ticks = (typeof params.show_ticks === 'undefined') ? false : params.show_ticks;
|
||||
|
||||
trials[i].show_response = params.show_response || "SECOND_STIMULUS";
|
||||
trials[i].show_response = params.show_response || "SECOND_STIMULUS";
|
||||
|
||||
trials[i].timing_first_stim = params.timing_first_stim || 1000; // default 1000ms
|
||||
trials[i].timing_second_stim = params.timing_second_stim || -1; // -1 = inf time; positive numbers = msec to display second image.
|
||||
trials[i].timing_image_gap = params.timing_image_gap || 1000; // default 1000ms
|
||||
trials[i].timing_first_stim = params.timing_first_stim || 1000; // default 1000ms
|
||||
trials[i].timing_second_stim = params.timing_second_stim || -1; // -1 = inf time; positive numbers = msec to display second image.
|
||||
trials[i].timing_image_gap = params.timing_image_gap || 1000; // default 1000ms
|
||||
|
||||
trials[i].is_html = (typeof params.is_html === 'undefined') ? false : params.is_html;
|
||||
trials[i].prompt = (typeof params.prompt === 'undefined') ? '' : params.prompt;
|
||||
}
|
||||
return trials;
|
||||
};
|
||||
trials[i].is_html = (typeof params.is_html === 'undefined') ? false : params.is_html;
|
||||
trials[i].prompt = (typeof params.prompt === 'undefined') ? '' : params.prompt;
|
||||
}
|
||||
return trials;
|
||||
};
|
||||
|
||||
var sim_trial_complete = false;
|
||||
var sim_trial_complete = false;
|
||||
|
||||
plugin.trial = function(display_element, trial) {
|
||||
plugin.trial = function(display_element, trial) {
|
||||
|
||||
// if any trial variables are functions
|
||||
// this evaluates the function and replaces
|
||||
// it with the output of the function
|
||||
trial = jsPsych.pluginAPI.normalizeTrialVariables(trial);
|
||||
// if any trial variables are functions
|
||||
// this evaluates the function and replaces
|
||||
// it with the output of the function
|
||||
trial = jsPsych.pluginAPI.normalizeTrialVariables(trial);
|
||||
|
||||
// this array holds handlers from setTimeout calls
|
||||
// that need to be cleared if the trial ends early
|
||||
var setTimeoutHandlers = [];
|
||||
// this array holds handlers from setTimeout calls
|
||||
// that need to be cleared if the trial ends early
|
||||
var setTimeoutHandlers = [];
|
||||
|
||||
// show the images
|
||||
if (!trial.is_html) {
|
||||
display_element.append($('<img>', {
|
||||
"src": trial.a_path,
|
||||
"id": 'jspsych_sim_stim'
|
||||
}));
|
||||
} else {
|
||||
display_element.append($('<div>', {
|
||||
"html": trial.a_path,
|
||||
"id": 'jspsych_sim_stim'
|
||||
}));
|
||||
}
|
||||
// show the images
|
||||
if (!trial.is_html) {
|
||||
display_element.append($('<img>', {
|
||||
"src": trial.a_path,
|
||||
"id": 'jspsych_sim_stim'
|
||||
}));
|
||||
} else {
|
||||
display_element.append($('<div>', {
|
||||
"html": trial.a_path,
|
||||
"id": 'jspsych_sim_stim'
|
||||
}));
|
||||
}
|
||||
|
||||
if (trial.show_response == "FIRST_STIMULUS") {
|
||||
show_response_slider(display_element, trial);
|
||||
}
|
||||
if (trial.show_response == "FIRST_STIMULUS") {
|
||||
show_response_slider(display_element, trial);
|
||||
}
|
||||
|
||||
setTimeoutHandlers.push(setTimeout(function() {
|
||||
showBlankScreen();
|
||||
}, trial.timing_first_stim));
|
||||
setTimeoutHandlers.push(setTimeout(function() {
|
||||
showBlankScreen();
|
||||
}, trial.timing_first_stim));
|
||||
|
||||
|
||||
function showBlankScreen() {
|
||||
function showBlankScreen() {
|
||||
|
||||
$('#jspsych_sim_stim').css('visibility', 'hidden');
|
||||
$('#jspsych_sim_stim').css('visibility', 'hidden');
|
||||
|
||||
setTimeoutHandlers.push(setTimeout(function() {
|
||||
showSecondStim();
|
||||
}, trial.timing_image_gap));
|
||||
}
|
||||
setTimeoutHandlers.push(setTimeout(function() {
|
||||
showSecondStim();
|
||||
}, trial.timing_image_gap));
|
||||
}
|
||||
|
||||
function showSecondStim() {
|
||||
function showSecondStim() {
|
||||
|
||||
if (!trial.is_html) {
|
||||
$('#jspsych_sim_stim').attr('src', trial.b_path);
|
||||
} else {
|
||||
$('#jspsych_sim_stim').html(trial.b_path);
|
||||
}
|
||||
if (!trial.is_html) {
|
||||
$('#jspsych_sim_stim').attr('src', trial.b_path);
|
||||
} else {
|
||||
$('#jspsych_sim_stim').html(trial.b_path);
|
||||
}
|
||||
|
||||
$('#jspsych_sim_stim').css('visibility', 'visible');
|
||||
$('#jspsych_sim_stim').css('visibility', 'visible');
|
||||
|
||||
if (trial.show_response == "SECOND_STIMULUS") {
|
||||
show_response_slider(display_element, trial);
|
||||
}
|
||||
if (trial.show_response == "SECOND_STIMULUS") {
|
||||
show_response_slider(display_element, trial);
|
||||
}
|
||||
|
||||
if (trial.timing_second_stim > 0) {
|
||||
setTimeoutHandlers.push(setTimeout(function() {
|
||||
$("#jspsych_sim_stim").css('visibility', 'hidden');
|
||||
if (trial.show_response == "POST_STIMULUS") {
|
||||
show_response_slider(display_element, trial);
|
||||
}
|
||||
}, trial.timing_second_stim));
|
||||
}
|
||||
}
|
||||
if (trial.timing_second_stim > 0) {
|
||||
setTimeoutHandlers.push(setTimeout(function() {
|
||||
$("#jspsych_sim_stim").css('visibility', 'hidden');
|
||||
if (trial.show_response == "POST_STIMULUS") {
|
||||
show_response_slider(display_element, trial);
|
||||
}
|
||||
}, trial.timing_second_stim));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function show_response_slider(display_element, trial) {
|
||||
function show_response_slider(display_element, trial) {
|
||||
|
||||
var startTime = (new Date()).getTime();
|
||||
var startTime = (new Date()).getTime();
|
||||
|
||||
// create slider
|
||||
display_element.append($('<div>', {
|
||||
"id": 'slider',
|
||||
"class": 'sim'
|
||||
}));
|
||||
// create slider
|
||||
display_element.append($('<div>', {
|
||||
"id": 'slider',
|
||||
"class": 'sim'
|
||||
}));
|
||||
|
||||
$("#slider").slider({
|
||||
value: Math.ceil(trial.intervals / 2),
|
||||
min: 1,
|
||||
max: trial.intervals,
|
||||
step: 1,
|
||||
});
|
||||
$("#slider").slider({
|
||||
value: Math.ceil(trial.intervals / 2),
|
||||
min: 1,
|
||||
max: trial.intervals,
|
||||
step: 1,
|
||||
});
|
||||
|
||||
// show tick marks
|
||||
if (trial.show_ticks) {
|
||||
for (var j = 1; j < trial.intervals - 1; j++) {
|
||||
$('#slider').append('<div class="slidertickmark"></div>');
|
||||
}
|
||||
// show tick marks
|
||||
if (trial.show_ticks) {
|
||||
for (var j = 1; j < trial.intervals - 1; j++) {
|
||||
$('#slider').append('<div class="slidertickmark"></div>');
|
||||
}
|
||||
|
||||
$('#slider .slidertickmark').each(function(index) {
|
||||
var left = (index + 1) * (100 / (trial.intervals - 1));
|
||||
$(this).css({
|
||||
'position': 'absolute',
|
||||
'left': left + '%',
|
||||
'width': '1px',
|
||||
'height': '100%',
|
||||
'background-color': '#222222'
|
||||
});
|
||||
});
|
||||
}
|
||||
$('#slider .slidertickmark').each(function(index) {
|
||||
var left = (index + 1) * (100 / (trial.intervals - 1));
|
||||
$(this).css({
|
||||
'position': 'absolute',
|
||||
'left': left + '%',
|
||||
'width': '1px',
|
||||
'height': '100%',
|
||||
'background-color': '#222222'
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// create labels for slider
|
||||
display_element.append($('<ul>', {
|
||||
"id": "sliderlabels",
|
||||
"class": 'sliderlabels',
|
||||
"css": {
|
||||
"width": "100%",
|
||||
"height": "3em",
|
||||
"margin": "10px 0px 0px 0px",
|
||||
"padding": "0px",
|
||||
"display": "block",
|
||||
"position": "relative"
|
||||
}
|
||||
}));
|
||||
// create labels for slider
|
||||
display_element.append($('<ul>', {
|
||||
"id": "sliderlabels",
|
||||
"class": 'sliderlabels',
|
||||
"css": {
|
||||
"width": "100%",
|
||||
"height": "3em",
|
||||
"margin": "10px 0px 0px 0px",
|
||||
"padding": "0px",
|
||||
"display": "block",
|
||||
"position": "relative"
|
||||
}
|
||||
}));
|
||||
|
||||
for (var j = 0; j < trial.labels.length; j++) {
|
||||
$("#sliderlabels").append('<li>' + trial.labels[j] + '</li>');
|
||||
}
|
||||
for (var j = 0; j < trial.labels.length; j++) {
|
||||
$("#sliderlabels").append('<li>' + trial.labels[j] + '</li>');
|
||||
}
|
||||
|
||||
// position labels to match slider intervals
|
||||
var slider_width = $("#slider").width();
|
||||
var num_items = trial.labels.length;
|
||||
var item_width = slider_width / num_items;
|
||||
var spacing_interval = slider_width / (num_items - 1);
|
||||
// position labels to match slider intervals
|
||||
var slider_width = $("#slider").width();
|
||||
var num_items = trial.labels.length;
|
||||
var item_width = slider_width / num_items;
|
||||
var spacing_interval = slider_width / (num_items - 1);
|
||||
|
||||
$("#sliderlabels li").each(function(index) {
|
||||
$(this).css({
|
||||
'display': 'inline-block',
|
||||
'width': item_width + 'px',
|
||||
'margin': '0px',
|
||||
'padding': '0px',
|
||||
'text-align': 'center',
|
||||
'position': 'absolute',
|
||||
'left': (spacing_interval * index) - (item_width / 2)
|
||||
});
|
||||
});
|
||||
$("#sliderlabels li").each(function(index) {
|
||||
$(this).css({
|
||||
'display': 'inline-block',
|
||||
'width': item_width + 'px',
|
||||
'margin': '0px',
|
||||
'padding': '0px',
|
||||
'text-align': 'center',
|
||||
'position': 'absolute',
|
||||
'left': (spacing_interval * index) - (item_width / 2)
|
||||
});
|
||||
});
|
||||
|
||||
// create button
|
||||
display_element.append($('<button>', {
|
||||
'id': 'next',
|
||||
'class': 'sim',
|
||||
'html': 'Submit Answer'
|
||||
}));
|
||||
// create button
|
||||
display_element.append($('<button>', {
|
||||
'id': 'next',
|
||||
'class': 'sim',
|
||||
'html': 'Submit Answer'
|
||||
}));
|
||||
|
||||
// if prompt is set, show prompt
|
||||
if (trial.prompt !== "") {
|
||||
display_element.append(trial.prompt);
|
||||
}
|
||||
// if prompt is set, show prompt
|
||||
if (trial.prompt !== "") {
|
||||
display_element.append(trial.prompt);
|
||||
}
|
||||
|
||||
$("#next").click(function() {
|
||||
var endTime = (new Date()).getTime();
|
||||
var response_time = endTime - startTime;
|
||||
$("#next").click(function() {
|
||||
var endTime = (new Date()).getTime();
|
||||
var response_time = endTime - startTime;
|
||||
|
||||
// kill any remaining setTimeout handlers
|
||||
for (var i = 0; i < setTimeoutHandlers.length; i++) {
|
||||
clearTimeout(setTimeoutHandlers[i]);
|
||||
}
|
||||
// kill any remaining setTimeout handlers
|
||||
for (var i = 0; i < setTimeoutHandlers.length; i++) {
|
||||
clearTimeout(setTimeoutHandlers[i]);
|
||||
}
|
||||
|
||||
var score = $("#slider").slider("value");
|
||||
jsPsych.data.write($.extend({}, {
|
||||
"sim_score": score,
|
||||
"rt": response_time,
|
||||
"stimulus": JSON.stringify([trial.a_path, trial.b_path])
|
||||
}, trial.data));
|
||||
// goto next trial in block
|
||||
display_element.html('');
|
||||
if (trial.timing_post_trial > 0) {
|
||||
setTimeout(function() {
|
||||
jsPsych.finishTrial();
|
||||
}, trial.timing_post_trial);
|
||||
} else {
|
||||
jsPsych.finishTrial();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
var score = $("#slider").slider("value");
|
||||
jsPsych.data.write($.extend({}, {
|
||||
"sim_score": score,
|
||||
"rt": response_time,
|
||||
"stimulus": JSON.stringify([trial.a_path, trial.b_path])
|
||||
}, trial.data));
|
||||
// goto next trial in block
|
||||
display_element.html('');
|
||||
if (trial.timing_post_trial > 0) {
|
||||
setTimeout(function() {
|
||||
jsPsych.finishTrial();
|
||||
}, trial.timing_post_trial);
|
||||
} else {
|
||||
jsPsych.finishTrial();
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
return plugin;
|
||||
})();
|
||||
return plugin;
|
||||
})();
|
||||
})(jQuery);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user