Mercurial > hg > webaudioevaluationtool

changeset 2381:5b23f2e05207

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes for #90. Edge should now be WAET compliant. Hacky temporary solution for #91.
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Fri, 20 May 2016 13:22:07 +0100
parents ae6a9d3426f8
children a7182dbc7fd4
files interfaces/AB.js interfaces/ABX.js interfaces/ape.js interfaces/discrete.js interfaces/horizontal-sliders.js
diffstat 5 files changed, 31 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/interfaces/AB.js	Fri May 20 13:14:10 2016 +0100
+++ b/interfaces/AB.js	Fri May 20 13:22:07 2016 +0100
@@ -5,7 +5,7 @@
 	// Get the dimensions of the screen available to the page
 	var width = window.innerWidth;
 	var height = window.innerHeight;
-	interfaceContext.insertPoint.innerHTML = null; // Clear the current schema
+	interfaceContext.insertPoint.innerHTML = ""; // Clear the current schema
 	
 	// Custom comparator Object
 	Interface.prototype.comparator = null;
@@ -325,7 +325,7 @@
 	};
 	
 	this.boxHolders = document.getElementById('box-holders');
-	this.boxHolders.innerHTML = null;
+	this.boxHolders.innerHTML = "";
 	this.comparators = [];
 	this.selected = null;
 	
--- a/interfaces/ABX.js	Fri May 20 13:14:10 2016 +0100
+++ b/interfaces/ABX.js	Fri May 20 13:22:07 2016 +0100
@@ -10,7 +10,7 @@
 	// Use this to do any one-time page / element construction. For instance, placing any stationary text objects,
 	// holding div's, or setting up any nodes which are present for the entire test sequence
     
-    interfaceContext.insertPoint.innerHTML = null; // Clear the current schema
+    interfaceContext.insertPoint.innerHTML = ""; // Clear the current schema
     
     Interface.prototype.checkScaleRange = function(min, max) {
         var page = testState.getCurrentTestPage();
@@ -126,7 +126,7 @@
 function loadTest(page)
 {
 	// Called each time a new test page is to be build. The page specification node is the only item passed in
-    document.getElementById('box-holders').innerHTML = null;
+    document.getElementById('box-holders').innerHTML = "";
     
     var interfaceObj = page.interfaces;
 	if (interfaceObj.length > 1)
--- a/interfaces/ape.js	Fri May 20 13:14:10 2016 +0100
+++ b/interfaces/ape.js	Fri May 20 13:22:07 2016 +0100
@@ -266,7 +266,7 @@
 	feedbackHolder.id = 'feedbackHolder';
 	
 	testContent.style.zIndex = 1;
-	interfaceContext.insertPoint.innerHTML = null; // Clear the current schema
+	interfaceContext.insertPoint.innerHTML = ""; // Clear the current schema
 	
 	// Inject into HTML
 	testContent.appendChild(title); // Insert the title
@@ -291,8 +291,8 @@
 	
 	var feedbackHolder = document.getElementById('feedbackHolder');
 	var sliderHolder = document.getElementById('slider-holder');
-	feedbackHolder.innerHTML = null;
-	sliderHolder.innerHTML = null;
+	feedbackHolder.innerHTML = "";
+	sliderHolder.innerHTML = "";
 	
 	// Delete outside reference
 	var outsideReferenceHolder = document.getElementById('outside-reference');
--- a/interfaces/discrete.js	Fri May 20 13:14:10 2016 +0100
+++ b/interfaces/discrete.js	Fri May 20 13:22:07 2016 +0100
@@ -92,7 +92,7 @@
 	feedbackHolder.id = 'feedbackHolder';
 	
 	testContent.style.zIndex = 1;
-	interfaceContext.insertPoint.innerHTML = null; // Clear the current schema
+	interfaceContext.insertPoint.innerHTML = ""; // Clear the current schema
 	
 	// Inject into HTML
 	testContent.appendChild(title); // Insert the title
@@ -113,7 +113,7 @@
 	var id = page.id;
 	
 	var feedbackHolder = document.getElementById('feedbackHolder');
-    feedbackHolder.innerHTML = null;
+    feedbackHolder.innerHTML = "";
 	var interfaceObj = page.interfaces;
 	if (interfaceObj.length > 1)
 	{
@@ -170,7 +170,7 @@
 	}
 	
 	var sliderBox = document.getElementById('slider-holder');
-	sliderBox.innerHTML = null;
+	sliderBox.innerHTML = "";
 	
 	var commentBoxPrefix = "Comment on track";
 	if (interfaceObj.commentBoxPrefix != undefined) {
@@ -405,9 +405,15 @@
 	var numObj = document.getElementsByClassName('track-slider').length;
 	var totalHeight = (numObj * 66)-30;
 	document.getElementById('scale-holder').style.width = window.innerWidth-220 + 'px';
+	// Cheers edge for making me delete a canvas every resize.
 	var canvas = document.getElementById('scale-canvas');
-	canvas.width = window.innerWidth-520;
-	canvas.height = totalHeight;
+    var new_canvas = document.createElement("canvas");
+    new_canvas.id = 'scale-canvas';
+    new_canvas.style.marginLeft = "150px";
+    canvas.parentElement.appendChild(new_canvas);
+    canvas.parentElement.removeChild(canvas);
+	new_canvas.width = window.innerWidth-520;
+	new_canvas.height = totalHeight;
 	for (var i in audioEngineContext.audioObjects)
 	{
 		if (audioEngineContext.audioObjects[i].specification.type != 'outside-reference'){
@@ -431,7 +437,7 @@
 	var height = canvas.height;
 	var width = canvas.width;
 	var textHolder = document.getElementById('scale-text-holder');
-	textHolder.innerHTML = null;
+	textHolder.innerHTML = "";
 	ctx.fillStyle = "#000000";
 	ctx.setLineDash([1,4]);
 	for (var scale of scales)
--- a/interfaces/horizontal-sliders.js	Fri May 20 13:14:10 2016 +0100
+++ b/interfaces/horizontal-sliders.js	Fri May 20 13:22:07 2016 +0100
@@ -92,7 +92,7 @@
 	feedbackHolder.id = 'feedbackHolder';
 	
 	testContent.style.zIndex = 1;
-	interfaceContext.insertPoint.innerHTML = null; // Clear the current schema
+	interfaceContext.insertPoint.innerHTML = ""; // Clear the current schema
 	
 	// Inject into HTML
 	testContent.appendChild(title); // Insert the title
@@ -113,7 +113,7 @@
 	var id = page.id;
 	
 	var feedbackHolder = document.getElementById('feedbackHolder');
-    feedbackHolder.innerHTML = null;
+    feedbackHolder.innerHTML = "";
     
 	var interfaceObj = page.interfaces;
 	if (interfaceObj.length > 1)
@@ -171,7 +171,7 @@
 	}
 	
 	var sliderBox = document.getElementById('slider-holder');
-	sliderBox.innerHTML = null;
+	sliderBox.innerHTML = "";
 	
 	var commentBoxPrefix = "Comment on track";
 	if (interfaceObj.commentBoxPrefix != undefined) {
@@ -359,9 +359,15 @@
 	var numObj = document.getElementsByClassName('track-slider').length;
 	var totalHeight = (numObj * 125)-25;
 	document.getElementById('scale-holder').style.width = window.innerWidth-220 + 'px';
+	// Cheers edge for making me delete a canvas every resize.
 	var canvas = document.getElementById('scale-canvas');
-	canvas.width = window.innerWidth-420;
-	canvas.height = totalHeight;
+    var new_canvas = document.createElement("canvas");
+    new_canvas.id = 'scale-canvas';
+    new_canvas.style.marginLeft = "100px";
+    canvas.parentElement.appendChild(new_canvas);
+    canvas.parentElement.removeChild(canvas);
+	new_canvas.width = window.innerWidth-420;
+	new_canvas.height = totalHeight;
 	for (var i in audioEngineContext.audioObjects)
 	{
 		if (audioEngineContext.audioObjects[i].specification.type != 'outside-reference'){
@@ -384,7 +390,7 @@
 	var height = canvas.height;
 	var width = canvas.width;
 	var textHolder = document.getElementById('scale-text-holder');
-	textHolder.innerHTML = null;
+	textHolder.innerHTML = "";
 	ctx.fillStyle = "#000000";
 	ctx.setLineDash([1,4]);
 	for (var scale of scales)