comparison core.js @ 1750:1365362c12d5

Merge from 156:402bb0f56dc4

 var audioContext; // Hold the browser web audio API
 var projectXML; // Hold the parsed setup XML
 var popup; // Hold the interfacePopup object
 var testState;
 var currentState; // Keep track of the current state (pre/post test, which test, final test? first test?)
-//var testXMLSetups = []; // Hold the parsed test instances
-//var testResultsHolders =[]; // Hold the results from each test for publishing to XML
 var currentTrackOrder = []; // Hold the current XML tracks in their (randomised) order
-//var currentTestHolder; // Hold any intermediate results during test - metrics
 var audioEngineContext; // The custome AudioEngine object
 var projectReturn; // Hold the URL for the return
-//var preTestQuestions = document.createElement('PreTest'); // Store any pre-test question response
-//var postTestQuestions = document.createElement('PostTest'); // Store any post-test question response
+
 
 // Add a prototype to the bufferSourceNode to reference to the audioObject holding it
 AudioBufferSourceNode.prototype.owner = undefined;
 
 window.onload = function() {

 			var textArea = document.createElement('textarea');
 			var br = document.createElement('br');
 			this.popupContent.appendChild(span);
 			this.popupContent.appendChild(br);
 			this.popupContent.appendChild(textArea);
+			this.popupContent.childNodes[2].focus();
 		}
 		this.popupContent.appendChild(this.popupButton);
-	}
+	};
 	
 	this.initState = function(node) {
 		//Call this with your preTest and postTest nodes when needed to
 		// initialise the popup procedure.
 		this.popupOptions = $(node).children();

 			}
 			this.currentIndex = 0;
 			this.showPopup();
 			this.postNode();
 		}
-	}
+	};
 	
 	this.buttonClicked = function() {
 		// Each time the popup button is clicked!
 		var node = this.popupOptions[this.currentIndex];
 		if (node.nodeName == 'question') {

 			} else {
 				testState.stateResults[testState.stateIndex].appendChild(this.responses);
 			}
 			advanceState();
 		}
-	}
+	};
 }
 
 function advanceState()
 {
 	// Just for complete clarity

 		xmlhttp.onerror = function(){
 			console.log('Error saving file to server! Presenting download locally');
 			createProjectSave(null);
 		};
 		xmlhttp.send(file);
+		if (xmlhttp.status == 404) {
+			createProjectSave(null);
+		}
 	}
 	return submitDiv;
 }
 
 // Only other global function which must be defined in the interface class. Determines how to create the XML document.

 			if (this.audioObjects[i].state == 0) {
 				// Track not ready
 				console.log('WAIT -- audioObject '+i+' not ready yet!');
 				ready = false;
 			};
-		}
-		if (ready == false) {
-			var holder = document.getElementById('testWaitIndicator');
-			holder.style.visibility = "visible";
-			setInterval(function() {
-				document.getElementById('testWaitIndicator').style.visibility = "hidden";
-			}, 10000);
 		}
 		return ready;
 	};
 	
 }

 	return hold
 	
 }
 
 function testWaitIndicator() {
-	var hold = document.createElement("div");
-	hold.id = "testWaitIndicator";
-	hold.style.position = "absolute";
-	hold.style.left = "100px";
-	hold.style.top = "10px";
-	hold.style.width = "500px";
-	hold.style.height = "100px";
-	hold.style.padding = "20px";
-	hold.style.backgroundColor = "rgb(100,200,200)";
-	hold.style.visibility = "hidden";
-	var span = document.createElement("span");
-	span.textContent = "Please wait! Elements still loading";
-	hold.appendChild(span);
-	var body = document.getElementsByTagName('body')[0];
-	body.appendChild(hold);
-}
-
-var hidetestwait = null;
+	if (audioEngineContext.checkAllReady() == false) {
+		var hold = document.createElement("div");
+		hold.id = "testWaitIndicator";
+		hold.className = "indicator-box";
+		var span = document.createElement("span");
+		span.textContent = "Please wait! Elements still loading";
+		hold.appendChild(span);
+		var body = document.getElementsByTagName('body')[0];
+		body.appendChild(hold);
+		testWaitTimerIntervalHolder = setInterval(function(){
+			var ready = audioEngineContext.checkAllReady();
+			if (ready) {
+				var elem = document.getElementById('testWaitIndicator');
+				var body = document.getElementsByTagName('body')[0];
+				body.removeChild(elem);
+				clearInterval(testWaitTimerIntervalHolder);
+			}
+		},500,false);
+	}
+}
+
+var testWaitTimerIntervalHolder = null;