HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-12 08:38:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #60 from jodeleeuw/dev

Browse Source 
update to v3.1
This commit is contained in:
Josh de Leeuw 2014-07-16 13:47:48 -04:00
commit ada763ce3b
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
jspsych.js
View File

@ -176,6 +176,10 @@
img.src = images[i]; img.src = images[i];
} }
}; };
core.getDisplayElement = function() {
return DOM_target;
}
// //
// private functions // // private functions //
@ -291,7 +295,7 @@
var data_string; var data_string;
if(format == 'JSON' || format == 'json') { if(format == 'JSON' || format == 'json') {
data_string = JSON.stringify(flatten_data(jsPsych.data(), append_data)); data_string = JSON.stringify(flattenData(jsPsych.data(), append_data));
} else if(format == 'CSV' || format == 'csv') { } else if(format == 'CSV' || format == 'csv') {
data_string = module.dataAsCSV(append_data); data_string = module.dataAsCSV(append_data);
} else { } else {
@ -316,6 +320,28 @@
return trials; return trials;
}; };
module.displayData = function(format) {
format = (typeof format === 'undefined') ? "json" : format.toLowerCase();
if(format != "json" && format != "csv") {
console.log('Invalid format declared for displayData function. Using json as default.');
format = "json";
}
var data_string;
if(format == 'json') {
data_string = JSON.stringify(flattenData(jsPsych.data()), undefined, 1);
} else {
data_string = module.dataAsCSV();
}
var display_element = jsPsych.getDisplayElement();
display_element.append($('<pre>', {
html: data_string
}));
}
// private function to save text file on local drive // private function to save text file on local drive
function saveTextToFile(textstr, filename) { function saveTextToFile(textstr, filename) {
var blobToSave = new Blob([textstr], { var blobToSave = new Blob([textstr], {
@ -328,7 +354,10 @@
else { else {
blobURL = window.URL.createObjectURL(blobToSave); blobURL = window.URL.createObjectURL(blobToSave);
} }
DOM_target.append($('<a>', {
var display_element = jsPsych.getDisplayElement();
display_element.append($('<a>', {
id: 'jspsych-download-as-text-link', id: 'jspsych-download-as-text-link',
href: blobURL, href: blobURL,
css: { css: {