breaking change

changes to the core jspsych.js file will break some backwards
compatibility. script files are no longer loaded dynamically, due to
issues with using $.getScript on local installations. this revision
makes defining a list of plugins unnecessary; they are automatically
recognized based on the experiment structure.

changes to similarity plugin: display is now sequential.

adding storybook plugin: this is an ipad plugin, which displays a single
image and records the location of touch events.

jspsych-similarity.js

@@ -21,17 +21,25 @@
 		{
 			switch(part){
 				case 1:
-					images = [trial.a_path, trial.b_path];
-					if(Math.floor(Math.random()*2)==0){
-						images = [trial.b_path, trial.a_path];
-					}
 					// show the images
 					$this.append($('<img>', {
-						"src": images[0],
+						"src": trial.a_path,
 						"class": 'sim'
 					}));
+					
+					setTimeout(function(){plugin.trial($this, block, trial, part + 1)}, trial.timing[0]);
+					break;
+					
+				case 2:
+				
+					$('.sim').remove();
+					
+					setTimeout(function(){plugin.trial($this, block, trial, part + 1)}, trial.timing[0]);
+					break;
+				case 3:
+				
 					$this.append($('<img>', {
-						"src": images[1],
+						"src": trial.b_path,
 						"class": 'sim'
 					}));
 
@@ -45,6 +53,13 @@
 							step:1,
 						});
 					
+					
+					// create labels for slider
+					$this.append($('<div>', {"id": 'slider_labels', "class": 'sim'}));
+					
+					$('#slider_labels').append($('<p class="slider_left sim">Not at all similar</p>'));
+					$('#slider_labels').append($('<p class="slider_right sim">Highly similar</p>'));
+						
 					//  create button
 					$this.append($('<button>', {'id':'next','class':'sim'}));
 					$("#next").html('Next');
@@ -52,7 +67,7 @@
 						plugin.trial($this,block,trial,part+1);
 					});
 					break;
-				case 2:
+				case 4:
 					// get data
 					var score = $("#slider").slider("value");
 					block.data[block.trial_idx] = {"score": score, "a_path": trial.a_path, "b_path": trial.b_path}

jspsych-storybook.js

@@ -0,0 +1,79 @@
+(function( $ ) {
+	jsPsych.storybook = (function(){
+	
+		var plugin = {};
+	
+		plugin.create = function(params) {
+			stims = params["stimuli"];
+			trials = new Array(stims.length);
+			for(var i = 0; i < trials.length; i++)
+			{
+				trials[i] = {};
+				trials[i]["type"] = "storybook";
+				trials[i]["a_path"] = stims[i];
+				trials[i]["click_num"] = params["click_num"];
+				trials[i]["timing"] = params["timing"];
+				if(params["data"]!=undefined){
+					trials[i]["data"] = params["data"][i];
+				}
+			}
+			return trials;
+		}
+
+		plugin.trial = function($this, block, trial, part)
+		{
+			switch(part){
+				case 1:
+					p1_time = (new Date()).getTime();
+					$this.append($('<img>', {
+						"src": trial.a_path,
+						"class": 'storybook'
+					}));
+					
+					var click_count = 0;
+					var click_locations = [];
+					var click_times = [];
+					
+					var touchfunction = function(e) {
+					
+						var rt = (new Date()).getTime() - p1_time;
+						var x = e.originalEvent.touches[0].pageX;
+						var y = e.originalEvent.touches[0].pageY;
+						
+						click_count = click_count + 1;
+						
+						console.log("click event "+x+" "+y+". click count "+click_count+". click num "+trial.click_num);
+						
+						//save location
+						click_locations.push([x,y]);
+						click_times.push(rt);
+						
+						//save response time
+						if(click_count == trial.click_num)
+						{
+							var click_loc_data = {"click_locations": click_locations};
+							var click_time_data = {"click_times": click_times};
+							// save data
+							block.data[block.trial_idx] = $.extend({}, click_loc_data, click_time_data);
+						
+							plugin.trial($this, block, trial, part + 1);
+						}
+					};
+					
+					$('.storybook').click(function(){ void(0); })
+					
+					//$('.storybook').mousedown(function(e){ touchfunction(e);});
+					$('.storybook').bind("touchstart", function(e){touchfunction(e);});
+					
+					break;
+				case 2:
+					$('.storybook').remove();
+					
+					setTimeout(function(){block.next();}, trial.timing[0]);
+					break;
+			}
+		}
+		
+		return plugin;
+	})();
+})(jQuery);

jspsych.js

@@ -36,6 +36,11 @@
 			// set target
 			DOM_target = $this;
 			
+			run();
+			/*
+			 * load scripts dynamically??
+			 *
+			 *
 			// load plugin script files
 			var scripts_loaded = 0;
 			// load all of the plugins that are defined in the opts["plugins"]
@@ -48,7 +53,7 @@
 						run();
 					}
 				});
-			}
+			}*/
 		}
 		
 		//
@@ -60,17 +65,9 @@
 			exp_blocks = new Array(opts["experiment_structure"].length);
 			
 			// iterate through block list to create trials
-			for(var i = exp_blocks.length-1; i>=0; i--)
+			for(var i = 0; i < exp_blocks.length; i++)
 			{
-				var trials = "undefined";
-				
-				for(var j = 0; j < opts["plugins"].length; j++)
-				{
-					if(opts["experiment_structure"][i]["type"] == opts["plugins"][j]["type"])
-					{
-						trials = jsPsych[opts["plugins"][j]["type"]]["create"].call(null, opts["experiment_structure"][i]);
-					}
-				}
+				var trials = jsPsych[opts["experiment_structure"][i]["type"]]["create"].call(null, opts["experiment_structure"][i]);
 				
 				exp_blocks[i] = createBlock(trials);
 			}
@@ -130,13 +127,7 @@
 		
 		function do_trial(block, trial)
 		{
-			for(var j = 0; j < opts["plugins"].length; j++)
-			{
-				if(trial.type == opts["plugins"][j]["type"])
-				{
-					jsPsych[opts["plugins"][j]["type"]]["trial"].call(this, DOM_target, block, trial, 1);
-				}
-			}
+			jsPsych[trial.type]["trial"].call(this, DOM_target, block, trial, 1);
 		}
 		
 		return core;