Mercurial > hg > webaudioevaluationtool

changeset 2664:93a7318fc2c5

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, 16 Mar 2017 12:21:02 +0000
parents e52cdf24e817 (current diff) 29672fa03c75 (diff)
children eb0b4082e2fc
files
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/interfaces/AB.js	Wed Mar 01 12:20:49 2017 +0000
+++ b/interfaces/AB.js	Thu Mar 16 12:21:02 2017 +0000
@@ -364,7 +364,10 @@
             var orNode = new interfaceContext.outsideReferenceDOM(audioObject, index, document.getElementById("outside-reference-holder"));
             audioObject.bindInterface(orNode);
         } else {
-            var label = interfaceContext.getLabel(labelType, index, audioHolderObject.labelStart);
+            var label = element.label;
+            if (label === "") {
+                label = interfaceContext.getLabel(labelType, index, audioHolderObject.labelStart);
+            }
             var node = new this.comparatorBox(audioObject, index, label);
             audioObject.bindInterface(node);
             this.comparators.push(node);
--- a/xml/test-schema.xsd	Wed Mar 01 12:20:49 2017 +0000
+++ b/xml/test-schema.xsd	Thu Mar 16 12:21:02 2017 +0000
@@ -181,7 +181,7 @@
                 <xs:attribute ref="id" use="required" />
                 <xs:attribute name="url" type="xs:anyURI" use="required" />
                 <xs:attribute name="gain" type="xs:decimal" default="0" />
-                <xs:attribute name="label" type="xs:string" />
+                <xs:attribute name="label" type="xs:string" default="" />
                 <xs:attribute ref="name" />
                 <xs:attribute name="type" default="normal">
                     <xs:simpleType>