# HG changeset patch
# User Nicholas Jillings <nickjillings@users.noreply.github.com>
# Date 1432977647 -3600
# Node ID 007cee4ea8586b91e5c6f118704dee512828c6d8
# Parent  5cfa9b3e8d03f64fa7dad6bc3b138ce8c576d916# Parent  a1fa52e656cc1f3612273d005e43a85e99c1684a
Merge from the default branch

diff -r a1fa52e656cc -r 007cee4ea858 ape.js
--- a/ape.js	Fri May 29 12:38:26 2015 +0100
+++ b/ape.js	Sat May 30 10:20:47 2015 +0100
@@ -179,7 +179,13 @@
 	pagetitle.appendChild(titleSpan);
 	
 	// Store the return URL path in global projectReturn
-	projectReturn = xmlSetup[0].attributes['projectReturn'].value;
+	projectReturn = xmlSetup[0].attributes['projectReturn'];
+	if (projectReturn == undefined) {
+		console.log("WARNING - projectReturn not specified! Will assume null.");
+		projectReturn = "null";
+	} else {
+		projectReturn = projectReturn.value;
+	}
 	
 	// Create Interface buttons!
 	var interfaceButtons = document.createElement('div');
diff -r a1fa52e656cc -r 007cee4ea858 core.js
--- a/core.js	Fri May 29 12:38:26 2015 +0100
+++ b/core.js	Sat May 30 10:20:47 2015 +0100
@@ -511,7 +511,7 @@
 	this.id = id;
 	this.state = 0; // 0 - no data, 1 - ready
 	this.url = null; // Hold the URL given for the output back to the results.
-	this.metric = new metricTracker();
+	this.metric = new metricTracker(this);
 	
 	this.played = false;
 	
@@ -654,7 +654,7 @@
 	this.initialiseTest = function(){};
 }
 
-function metricTracker()
+function metricTracker(caller)
 {
 	/* Custom object to track and collect metric data
 	 * Used only inside the audioObjects object.
@@ -668,6 +668,7 @@
 	this.wasListenedTo = false;
 	this.wasMoved = false;
 	this.hasComments = false;
+	this.parent = caller;
 	
 	this.initialised = function(position)
 	{
@@ -689,8 +690,9 @@
 			this.wasListenedTo = true;
 			this.listenStart = time;
 			this.listenHold = true;
-		} 
-	}
+			console.log('slider ' + this.parent.id + ' played (' + time + ')'); // DEBUG/SAFETY: show played slider id
+		}
+	};
 	
 	this.stopListening = function(time)
 	{
diff -r a1fa52e656cc -r 007cee4ea858 example_eval/project.xml
--- a/example_eval/project.xml	Fri May 29 12:38:26 2015 +0100
+++ b/example_eval/project.xml	Sat May 30 10:20:47 2015 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BrowserEvalProjectDocument>
-	<setup interface="APE" projectReturn="http://127.0.0.1:8000/save" randomiseOrder='true' collectMetrics='true'>
+	<setup interface="APE" projectReturn="/save" randomiseOrder='true' collectMetrics='true'>
 		<PreTest>
 			<question id="Location" mandatory="true">Please enter your location.</question>
 			<statement>Please listen to all mixes</statement>