Mercurial > hg > webaudioevaluationtool

changeset 2795:b4735c529a8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor compile issues in APE
author Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
date Sun, 23 Apr 2017 11:17:05 +0100
parents b4e91500891a
children 35037fb7a843
files interfaces/ape.js
diffstat 1 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/interfaces/ape.js	Sun Apr 23 11:10:38 2017 +0100
+++ b/interfaces/ape.js	Sun Apr 23 11:17:05 2017 +0100
@@ -106,7 +106,7 @@
                 return {
                     min: Math.min(a.min, v),
                     max: Math.max(a.max, v)
-                }
+                };
             }, {
                 min: 100,
                 max: 0
@@ -253,7 +253,7 @@
     var interfaceObj = interfaceContext.getCombinedInterfaces(audioHolderObject);
     interfaceObj.forEach(function (interfaceObjectInstance) {
         // Create the div box to center align
-        interfaceContext.interfaceSliders.push(new interfaceSliderHolder(interfaceObjectInstance));
+        interfaceContext.interfaceSliders.push(new interfaceSliderHolder(interfaceObjectInstance, audioHolderObject));
     });
     interfaceObj.forEach(function (interface) {
         interface.options.forEach(function (option) {
@@ -447,7 +447,7 @@
     //testWaitIndicator();
 }
 
-function interfaceSliderHolder(interfaceObject) {
+function interfaceSliderHolder(interfaceObject, page) {
     this.sliders = [];
     this.metrics = [];
     this.id = document.getElementsByClassName("sliderCanvasDiv").length;
@@ -464,11 +464,11 @@
         imageController.root.appendChild(imageController.img);
         imageController.setImage = function (src) {
             imageController.img.src = "";
-            if (typeof src !== "string" || src.length == undefined) {
+            if (typeof src !== "string" || src.length === undefined) {
                 return;
             }
             imageController.img.src = src;
-        }
+        };
         return imageController;
     })();
 
@@ -485,7 +485,9 @@
     pagetitle.appendChild(titleSpan);
     this.sliderDOM.appendChild(pagetitle);
 
-    if (interfaceObject.image !== undefined) {
+    if (interfaceObject.image !== undefined || page.audioElements.some(function (a) {
+            return a.image !== undefined;
+        })) {
         this.sliderDOM.appendChild(this.imageHolder.root);
         this.imageHolder.setImage(interfaceObject.image);
     }
@@ -733,8 +735,8 @@
     }
 
     for (var i = 0; i < checks.length; i++) {
+        var checkState = true;
         if (checks[i].type == 'check') {
-            var checkState = true;
             switch (checks[i].name) {
                 case 'fragmentPlayed':
                     // Check if all fragments have been played