diff interfaces/discrete.js @ 2381:5b23f2e05207

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 a3099bdb056c
children dc13bd68ea34
line wrap: on
line diff
--- 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)