Mercurial > hg > webaudioevaluationtool

changeset 2285:e59327ebdb15

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix for #27. Further improvements for #22. APE no longer blocks if outside-reference defined and check all moved selected.
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Fri, 22 Apr 2016 10:15:12 +0100
parents 29e754aca00f
children 1448b446d6b3 0141cbd1169b
files css/core.css index.html interfaces/ape.js test.html tests/examples/project.xml
diffstat 5 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/css/core.css	Fri Apr 22 09:52:28 2016 +0100
+++ b/css/core.css	Fri Apr 22 10:15:12 2016 +0100
@@ -50,12 +50,13 @@
     margin-bottom: 35px;
 }
 
-div#popupTitle {
+div#popupTitleHolder {
     width: inherit;
     min-height: 25px;
     max-height: 250px;
     overflow: auto;
     margin-bottom: 5px;
+    text-align: center;
 }
 
 div#popupResponse {
--- a/index.html	Fri Apr 22 09:52:28 2016 +0100
+++ b/index.html	Fri Apr 22 10:15:12 2016 +0100
@@ -68,7 +68,7 @@
 		</div>
         <div id="popupHolder" class="popupHolder" style="visibility: hidden; z-index: -1">
             <div id="popupContent">
-                <div id="popupTitleHolder" style="text-align: center">
+                <div id="popupTitleHolder">
                     <span id="popupTitle"></span>
                 </div>
                 <div id="popupResponse"></div>
--- a/interfaces/ape.js	Fri Apr 22 09:52:28 2016 +0100
+++ b/interfaces/ape.js	Fri Apr 22 10:15:12 2016 +0100
@@ -53,7 +53,8 @@
 			var interfaceTID = [];
 			for (var j=0; j<this.interfaceSliders[i].metrics.length; j++)
 			{
-				if (this.interfaceSliders[i].metrics[j].wasMoved == false)
+                var ao_id = this.interfaceSliders[i].sliders[j].getAttribute("trackIndex");
+				if (this.interfaceSliders[i].metrics[j].wasMoved == false && audioEngineContext.audioObjects[ao_id].interfaceDOM.canMove())
 				{
 					state = false;
 					interfaceTID.push(j);
--- a/test.html	Fri Apr 22 09:52:28 2016 +0100
+++ b/test.html	Fri Apr 22 10:15:12 2016 +0100
@@ -54,7 +54,7 @@
 		</div>
         <div id="popupHolder" class="popupHolder" style="visibility: hidden; z-index: -1">
             <div id="popupContent">
-                <div id="popupTitleHolder" style="text-align: center">
+                <div id="popupTitleHolder">
                     <span id="popupTitle"></span>
                 </div>
                 <div id="popupResponse"></div>
--- a/tests/examples/project.xml	Fri Apr 22 09:52:28 2016 +0100
+++ b/tests/examples/project.xml	Fri Apr 22 10:15:12 2016 +0100
@@ -88,7 +88,7 @@
 			</surveyentry>
 		</survey>
 	</page>
-	<page id='test-1' hostURL="media/example/" randomiseOrder='true' repeatCount='0' loop='false' showElementComments='true' label="none">
+	<page id='test-1' hostURL="media/example/" randomiseOrder='true' repeatCount='0' loop='false' showElementComments='true' label="letter">
 		<commentboxprefix>Comment on fragment</commentboxprefix>
 		<interface name="preference">
 			<title>Example Test Question</title>