# HG changeset patch
# User Nicholas Jillings <nickjillings@users.noreply.github.com>
# Date 1431895028 -3600
# Node ID 207a14aac2c6da126c5df6f8bc239e54b16c03a4
# Parent  e5f1caa513d818ed07747f0a5d40d351dc7288e2# Parent  38c4ef86b5592aa6096f7c914cd21a7cf5d12afc
Merge

diff -r e5f1caa513d8 -r 207a14aac2c6 ape.js
--- a/ape.js	Sun May 17 18:40:56 2015 +0100
+++ b/ape.js	Sun May 17 21:37:08 2015 +0100
@@ -242,7 +242,7 @@
 	currentState = 'preTest';
 	
 	// Create Pre-Test Box
-	if (preTest != undefined && preTest.children.length >= 1)
+	if (preTest != undefined && preTest.childElementCount >= 1)
 	{
 		showPopup();
 		preTestPopupStart(preTest);
@@ -537,7 +537,7 @@
 	// Now process any pre-test commands
 	
 	var preTest = $(testXMLSetups[id]).find('PreTest')[0];
-	if (preTest.children.length > 0)
+	if (preTest.childElementCount > 0)
 	{
 		currentState = 'testRunPre-'+id;
 		preTestPopupStart(preTest);
@@ -556,15 +556,15 @@
 	preTestOption.id = 'preTest';
 	preTestOption.style.marginTop = '25px';
 	preTestOption.align = "center";
-	var child = preTest.children[0];
+	var child = $(preTest).children()[0];
 	if (child.nodeName == 'statement')
 	{
-		preTestOption.innerHTML = '<span>'+child.innerHTML+'</span>';
+		preTestOption.innerHTML = '<span>'+child.textContent+'</span>';
 	} else if (child.nodeName == 'question')
 	{
 		var questionId = child.attributes['id'].value;
 		var textHold = document.createElement('span');
-		textHold.innerHTML = child.innerHTML;
+		textHold.innerHTML = child.textContent;
 		textHold.id = questionId + 'response';
 		var textEnter = document.createElement('textarea');
 		preTestOption.appendChild(textHold);
@@ -616,11 +616,11 @@
 	// Need to find and parse preTest again!
 	var preTestOption = document.getElementById('preTest');
 	// Check if current state is a question!
-	if (preTest.children[index].nodeName == 'question') {
-		var questionId = preTest.children[index].attributes['id'].value;
+	if ($(preTest).children()[index].nodeName == 'question') {
+		var questionId = $(preTest).children()[index].attributes['id'].value;
 		var questionHold = document.createElement('comment');
 		var questionResponse = document.getElementById(questionId + 'response');
-		var mandatory = preTest.children[index].attributes['mandatory'];
+		var mandatory = $(preTest).children()[index].attributes['mandatory'];
 		if (mandatory != undefined){
 			if (mandatory.value == 'true') {mandatory = true;}
 			else {mandatory = false;}
@@ -633,17 +633,17 @@
 		postPopupResponse(questionHold);
 	}
 	index++;
-	if (index < preTest.children.length)
+	if (index < preTest.childElementCount)
 	{
 		// More to process
-		var child = preTest.children[index];
+		var child = $(preTest).children()[index];
 		if (child.nodeName == 'statement')
 		{
-			preTestOption.innerHTML = '<span>'+child.innerHTML+'</span>';
+			preTestOption.innerHTML = '<span>'+child.textContent+'</span>';
 		} else if (child.nodeName == 'question')
 		{
 			var textHold = document.createElement('span');
-			textHold.innerHTML = child.innerHTML;
+			textHold.innerHTML = child.textContent;
 			var textEnter = document.createElement('textarea');
 			textEnter.id = child.attributes['id'].value + 'response';
 			var br = document.createElement('br');
@@ -748,7 +748,7 @@
 		if (postXML == undefined) {
 			testEnded(testId);
 		}
-		else if (postXML.children.length > 0)
+		else if (postXML.childElementCount > 0)
 		{
 			currentState = 'testRunPost-'+testId; 
 			showPopup();