From 594be10e526fc5a8fe87b8a53075ba29b0773b97 Mon Sep 17 00:00:00 2001
From: Josh de Leeuw <josh.deleeuw@gmail.com>
Date: Thu, 10 Jul 2014 11:45:01 -0400
Subject: [PATCH 1/5] add dataAPI.displayData

---
 jspsych.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/jspsych.js b/jspsych.js
index 33fb20bc..1afba4c1 100755
--- a/jspsych.js
+++ b/jspsych.js
@@ -316,6 +316,26 @@
             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(flatten_data(jsPsych.data()));
+            } else {
+                data_string = module.dataAsCSV(append_data);
+            } 
+            
+            DOM_target.append($('<pre>', {
+                html: data_string
+            }));
+        }
+        
         // private function to save text file on local drive
         function saveTextToFile(textstr, filename) {
             var blobToSave = new Blob([textstr], {

From 8d3d9af0db4a35ae939b395ebb0088f6c327b3e7 Mon Sep 17 00:00:00 2001
From: Josh de Leeuw <josh.deleeuw@gmail.com>
Date: Thu, 10 Jul 2014 11:49:40 -0400
Subject: [PATCH 2/5] bug fix flatten_data -> flattenData

---
 jspsych.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jspsych.js b/jspsych.js
index 1afba4c1..fd465798 100755
--- a/jspsych.js
+++ b/jspsych.js
@@ -291,7 +291,7 @@
             var data_string;
             
             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') {
                 data_string = module.dataAsCSV(append_data);
             } else {
@@ -326,7 +326,7 @@
             var data_string;
             
             if(format == 'json') {
-                data_string = JSON.stringify(flatten_data(jsPsych.data()));
+                data_string = JSON.stringify(flattenData(jsPsych.data()));
             } else {
                 data_string = module.dataAsCSV(append_data);
             } 

From fc16067939a2b4d337484480b6c2cf9aeec62a1f Mon Sep 17 00:00:00 2001
From: Josh de Leeuw <josh.deleeuw@gmail.com>
Date: Thu, 10 Jul 2014 12:00:56 -0400
Subject: [PATCH 3/5] add getter method for DOM_target, update module methods

---
 jspsych.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/jspsych.js b/jspsych.js
index fd465798..9b452ce3 100755
--- a/jspsych.js
+++ b/jspsych.js
@@ -176,6 +176,10 @@
                 img.src = images[i];
             }
         };
+        
+        core.getDisplayElement = function() {
+            return DOM_target;
+        }
 
         //
         // private functions //
@@ -331,7 +335,9 @@
                 data_string = module.dataAsCSV(append_data);
             } 
             
-            DOM_target.append($('<pre>', {
+            var display_element = jsPsych.getDisplayElement();
+            
+            display_element.append($('<pre>', {
                 html: data_string
             }));
         }
@@ -348,7 +354,10 @@
             else {
                 blobURL = window.URL.createObjectURL(blobToSave);
             }
-            DOM_target.append($('<a>', {
+            
+            var display_element = jsPsych.getDisplayElement();
+            
+            display_element.append($('<a>', {
                 id: 'jspsych-download-as-text-link',
                 href: blobURL,
                 css: {

From fdf77c79dd19563497a4dfbe47a8619c4fa591ce Mon Sep 17 00:00:00 2001
From: Josh de Leeuw <josh.deleeuw@gmail.com>
Date: Thu, 10 Jul 2014 12:03:51 -0400
Subject: [PATCH 4/5] make json pretty

---
 jspsych.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jspsych.js b/jspsych.js
index 9b452ce3..4dfb1fbb 100755
--- a/jspsych.js
+++ b/jspsych.js
@@ -330,7 +330,7 @@
             var data_string;
             
             if(format == 'json') {
-                data_string = JSON.stringify(flattenData(jsPsych.data()));
+                data_string = JSON.stringify(flattenData(jsPsych.data()), undefined, 1);
             } else {
                 data_string = module.dataAsCSV(append_data);
             } 

From 26052c22a1afa4c398cacabd1fd9aabc24c77339 Mon Sep 17 00:00:00 2001
From: Josh de Leeuw <josh.deleeuw@gmail.com>
Date: Thu, 10 Jul 2014 12:14:05 -0400
Subject: [PATCH 5/5] remove append_data

---
 jspsych.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jspsych.js b/jspsych.js
index 4dfb1fbb..a890b6d0 100755
--- a/jspsych.js
+++ b/jspsych.js
@@ -332,7 +332,7 @@
             if(format == 'json') {
                 data_string = JSON.stringify(flattenData(jsPsych.data()), undefined, 1);
             } else {
-                data_string = module.dataAsCSV(append_data);
+                data_string = module.dataAsCSV();
             } 
             
             var display_element = jsPsych.getDisplayElement();