Mercurial > hg > webaudioevaluationtool

changeset 2561:f5d8a0af942f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool
author www-data <www-data@sucuk.dcs.qmul.ac.uk>
date Thu, 19 Jan 2017 17:20:44 +0000
parents 137f5e0afcb8 (current diff) 0c724e7c8c26 (diff)
children 33c76ab5924a
files
diffstat 2 files changed, 27 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/interfaces/AB.js	Thu Jan 19 11:20:54 2017 +0000
+++ b/interfaces/AB.js	Thu Jan 19 17:20:44 2017 +0000
@@ -360,31 +360,33 @@
             audioObject.bindInterface(orNode);
         } else {
             var label;
-            switch (audioObject.specification.parent.label) {
-                case "none":
-                    label = "";
-                    break;
-                case "number":
-                    label = "" + index;
-                    break;
-                case "letter":
-                    label = String.fromCharCode(97 + index);
-                    break;
-                case "samediff":
-                    console.log("index = " + index); 
-                    if(index == 0){
-                        label = "same";
-                    }
-                    else if (index == 1){
-                        label = "different";
-                    }
-                    else{
+            if (audioObject.specification.label && audioObject.specification.label.length > 0) {
+                label = audioObject.specification.label;
+            } else {
+                switch (audioObject.specification.parent.label) {
+                    case "none":
                         label = "";
-                    }
-                    break;
-                default:
-                    label = String.fromCharCode(65 + index);
-                    break;
+                        break;
+                    case "number":
+                        label = "" + index;
+                        break;
+                    case "letter":
+                        label = String.fromCharCode(97 + index);
+                        break;
+                    case "samediff":
+                        console.log("index = " + index);
+                        if (index == 0) {
+                            label = "same";
+                        } else if (index == 1) {
+                            label = "different";
+                        } else {
+                            label = "";
+                        }
+                        break;
+                    default:
+                        label = String.fromCharCode(65 + index);
+                        break;
+                }
             }
             var node = new this.comparatorBox(audioObject, index, label);
             audioObject.bindInterface(node);
--- a/js/core.js	Thu Jan 19 11:20:54 2017 +0000
+++ b/js/core.js	Thu Jan 19 17:20:44 2017 +0000
@@ -1192,7 +1192,7 @@
                 var elemInclude = [];
                 var elemPool = [];
                 for (var elem of pageInclude[i].audioElements) {
-                    if (elem.include || elem.type != "normal") {
+                    if (elem.alwaysInclude || elem.type != "normal") {
                         elemInclude.push(elem);
                     } else {
                         elemPool.push(elem);