changeset 2380:ae6a9d3426f8

Fixes for #90. Hacky 'solution' to #91.
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Fri, 20 May 2016 13:14:10 +0100
parents 1e7d98ca83be
children 5b23f2e05207
files interfaces/mushra.css interfaces/mushra.js
diffstat 2 files changed, 29 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/interfaces/mushra.css	Fri May 20 10:33:41 2016 +0100
+++ b/interfaces/mushra.css	Fri May 20 13:14:10 2016 +0100
@@ -101,6 +101,13 @@
 	border: 1px solid #000;
 }
 
+input[type=range]::-ms-track {
+	cursor: pointer;
+	background: #fff;
+	border-radius: 4px;
+	border: 1px solid #000;
+}
+
 input.track-slider-not-moved[type=range]::-webkit-slider-runnable-track {
 	background: #aaa;
 }
@@ -123,6 +130,16 @@
 	margin-left: -4px;
 }
 
+input[type=range]::-ms-thumb {
+	cursor: pointer;
+	margin-top: -1px;
+	margin-left: -4px;
+}
+
+input[type=range]::-ms-tooltip {
+	visibility:hidden;
+}
+
 div#page-count {
     float: left;
     margin: 0px 5px;
--- a/interfaces/mushra.js	Fri May 20 10:33:41 2016 +0100
+++ b/interfaces/mushra.js	Fri May 20 13:14:10 2016 +0100
@@ -94,7 +94,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
@@ -114,7 +114,7 @@
 	var id = audioHolderObject.id;
 	
 	var feedbackHolder = document.getElementById('feedbackHolder');
-    feedbackHolder.innerHTML = null;
+    feedbackHolder.innerHTML = "";
 	var interfaceObj = audioHolderObject.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) {
@@ -390,9 +390,14 @@
 	}
 	document.getElementById('scale-holder').style.marginLeft = (diff-100) + 'px';
 	document.getElementById('scale-text-holder').style.height = window.innerHeight-194 + 'px';
+    // Cheers edge for making me delete a canvas every resize.
 	var canvas = document.getElementById('scale-canvas');
-	canvas.width = totalWidth;
-	canvas.height = window.innerHeight-194;
+    var new_canvas = document.createElement("canvas");
+    new_canvas.id = 'scale-canvas';
+    canvas.parentElement.appendChild(new_canvas);
+    canvas.parentElement.removeChild(canvas);
+	new_canvas.width = totalWidth;
+	new_canvas.height = window.innerHeight-194;
 	drawScale();
 }
 
@@ -407,9 +412,10 @@
 	var ctx = canvas.getContext("2d");
 	var height = canvas.height;
 	var width = canvas.width;
+    ctx.clearRect(0,0,canvas.width,canvas.height);
 	var draw_heights = [24, height-34];
 	var textHolder = document.getElementById('scale-text-holder');
-	textHolder.innerHTML = null;
+	textHolder.innerHTML = "";
 	var lastHeight = 0;
 	for (var scale of scales)
 	{