From e697961a751b0ca0c25c44197e05ae85ab4d15ba Mon Sep 17 00:00:00 2001
From: Josh de Leeuw <josh.deleeuw@gmail.com>
Date: Fri, 8 Nov 2013 22:24:28 -0500
Subject: [PATCH] renaming stuff in html plugin

---
 plugins/jspsych-free-sort.js | 6 +++---
 plugins/jspsych-html.js      | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/plugins/jspsych-free-sort.js b/plugins/jspsych-free-sort.js
index b90bad85..533e65f8 100644
--- a/plugins/jspsych-free-sort.js
+++ b/plugins/jspsych-free-sort.js
@@ -31,9 +31,9 @@
                 trials[i] = {
                     "type": "free-sort",
                     "images": params.stimuli[i], // array of images to display
-                    "stim_height": params.stim_height,
-                    "stim_width": params.stim_width,
-                    "timing": params.timing_post_trial || 1000,
+                    "stim_height": params.stim_height || 100,
+                    "stim_width": params.stim_width || 100,
+                    "timing_post_trial": params.timing_post_trial || 1000,
                     "prompt": (typeof params.prompt === 'undefined') ? '' : params.prompt,
                     "prompt_location": params.prompt_location || "above",
                     "sort_area_width": params.sort_area_width || 800,
diff --git a/plugins/jspsych-html.js b/plugins/jspsych-html.js
index d4453ecb..7ccf6ad0 100644
--- a/plugins/jspsych-html.js
+++ b/plugins/jspsych-html.js
@@ -24,11 +24,10 @@ Data:
   
 
 Example Usage:
-  jsPsych.init($('#target'), 
+  jsPsych.init( 
     {experiment_structure: [
 		   {type: "html", pages:[{url: "intro.html", cont_btn: "start"}]}
-		 ],
-		 finish: function(data) { }
+		 ]
 	});
 */
 (function($) {
@@ -44,7 +43,7 @@ Example Usage:
                     url: params.pages[i].url,
                     cont_key: params.pages[i].cont_key || params.cont_key,
                     cont_btn: params.pages[i].cont_btn || params.cont_btn,
-                    timing_post_trial: params.pages[i].timing || params.timing,
+                    timing_post_trial: params.pages[i].timing_post_trial || params.timing_post_trial,
                     check_fn: params.pages[i].check_fn,
                     force_refresh: params.force_refresh || false
                 });