Mercurial > hg > webaudioevaluationtool

changeset 3011:03b9e845f730

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Completed refactoring of ape.js to be modular.
author Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
date Fri, 04 Aug 2017 11:27:55 +0200
parents 7bbf1b1bfd95
children 5acdaf4c14c3
files interfaces/ape.js
diffstat 1 files changed, 12 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/interfaces/ape.js	Fri Aug 04 10:56:26 2017 +0200
+++ b/interfaces/ape.js	Fri Aug 04 11:27:55 2017 +0200
@@ -23,11 +23,11 @@
     // Bindings for interfaceContext
 
     interfaceContext.checkAllMoved = function () {
-        module.checkAllMoved();
+        return module.checkAllMoved();
     };
 
     interfaceContext.checkScaleRange = function () {
-        module.checkScaleRange();
+        return module.checkScaleRange();
     };
 
     // Bindings for audioObjects
@@ -310,7 +310,7 @@
             trackObj.align = "center";
             trackObj.className = 'track-slider track-slider-disabled';
             trackObj.appendChild(labelHolder);
-            trackObj.style.left = (Math.random() * $(sliderRail).width()) - 50 + "px";
+            trackObj.style.left = (Math.random() * $(sliderRail).width()) + 50 + "px";
             axisInterface.sliderRail.appendChild(trackObj);
             metric.initialise(this.value);
             this.setLabel = function (s) {
@@ -369,7 +369,9 @@
                 nodes.forEach(function (elem) {
                     var name = elem.getAttribute("name");
                     if (name == "elementTracker" || name == "elementTrackerFull" || name == "elementInitialPosition" || name == "elementFlagMoved") {
-                        mrnodes[j].setAttribute("interface-name", axisInterface.name);
+                        elem.setAttribute("interface-name", axisInterface.name);
+                    } else {
+                        inject.removeChild(elem);
                     }
                 });
             }
@@ -621,6 +623,7 @@
                 audioObject.bindInterface(orNode);
             } else {
                 var aoi = new audioObjectInterface(audioObject, this);
+                AOIs.push(aoi);
                 var label = interfaceContext.getLabel(page.label, index, page.labelStart);
                 axis.forEach(function (a) {
                     var node = a.addSlider(aoi);
@@ -666,9 +669,11 @@
         return cont;
     }
     this.pageXMLSave = function (store, pageSpecification) {
-        AOIs.forEach(function (ao) {
-            ao.pageXMLSave(store);
-        });
+        if (axis.length > 1) {
+            AOIs.forEach(function (ao) {
+                ao.pageXMLSave(store);
+            });
+        }
     }
 }