Mercurial > hg > webaudioevaluationtool

changeset 296:d3d691e33fec Dev_main

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
APE: Multiple Screen proof
author Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
date Thu, 10 Sep 2015 12:53:55 +0100
parents 2d64fec077a5
children a8db8084d32a
files ape.js
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ape.js	Thu Sep 10 12:43:47 2015 +0100
+++ b/ape.js	Thu Sep 10 12:53:55 2015 +0100
@@ -507,10 +507,8 @@
 	var w = slider.style.width;
 	w = Number(w.substr(0,w.length-2));
 	var x = ev.x;
-	if (x < 0)
-	{
-		x += -1.0*ev.view.screenLeft;
-	}
+	x += Math.abs(ev.view.screenLeft);
+	x = x % ev.view.outerWidth;
 	if (x >= marginSize && x < w+marginSize) {
 		this.style.left = (x)+'px';
 	} else {
@@ -526,7 +524,7 @@
 	console.log('slider '+id+' moved to '+convSliderPosToRate(ev.srcElement)+' ('+time+')');
 }
 
-function buttonSubmitClick() // TODO: Only when all songs have been played!
+function buttonSubmitClick()
 {
 	var checks = testState.currentStateMap[testState.currentIndex].interfaces[0].options;
 	var canContinue = true;