changeset 240:5fd3ba494551 Dev_main

Feature #1283: Project specification node <BrowserEvalProjectDocument> now included in output file.
author Nicholas Jillings <nicholas.jillings@eecs.qmul.ac.uk>
date Thu, 25 Jun 2015 17:03:40 +0100
parents 6b72d1c5a5c4
children b4ca52c105ba
files ape.js core.js
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ape.js	Thu Jun 25 16:37:51 2015 +0100
+++ b/ape.js	Thu Jun 25 17:03:40 2015 +0100
@@ -298,11 +298,11 @@
 	feedbackHolder.innerHTML = null;
 	canvas.innerHTML = null;
 	
-	//var playbackHolder = document.createElement('div');
-	//playbackHolder.style.width = "100%";
-	//playbackHolder.align = 'center';
-	//playbackHolder.appendChild(interfaceContext.playhead.object);
-	//feedbackHolder.appendChild(playbackHolder);
+	var playbackHolder = document.createElement('div');
+	playbackHolder.style.width = "100%";
+	playbackHolder.align = 'center';
+	playbackHolder.appendChild(interfaceContext.playhead.object);
+	feedbackHolder.appendChild(playbackHolder);
 	// Setup question title
 	var interfaceObj = audioHolderObject.interfaces;
 	var commentBoxPrefix = "Comment on track";
--- a/core.js	Thu Jun 25 16:37:51 2015 +0100
+++ b/core.js	Thu Jun 25 17:03:40 2015 +0100
@@ -638,6 +638,7 @@
 function interfaceXMLSave(){
 	// Create the XML string to be exported with results
 	var xmlDoc = document.createElement("BrowserEvaluationResult");
+	xmlDoc.appendChild(specification.projectXML);
 	xmlDoc.appendChild(returnDateNode());
 	for (var i=0; i<testState.stateResults.length; i++)
 	{
@@ -1221,6 +1222,7 @@
 	
 	this.decode = function() {
 		// projectXML - DOM Parsed document
+		this.projectXML = projectXML.childNodes[0];
 		var setupNode = projectXML.getElementsByTagName('setup')[0];
 		this.interfaceType = setupNode.getAttribute('interface');
 		this.projectReturn = setupNode.getAttribute('projectReturn');