Mercurial > hg > webaudioevaluationtool

changeset 2705:7b1dfb582637

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' into vnext
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Thu, 16 Mar 2017 12:22:30 +0000
parents 3a0be105ee85 (current diff) 29672fa03c75 (diff)
children 8f485581ee73
files interfaces/AB.js
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/interfaces/AB.js	Mon Mar 13 13:29:28 2017 +0000
+++ b/interfaces/AB.js	Thu Mar 16 12:22:30 2017 +0000
@@ -336,7 +336,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);
             Object.defineProperties(node, {
                 'comparator': {
--- a/xml/test-schema.xsd	Mon Mar 13 13:29:28 2017 +0000
+++ b/xml/test-schema.xsd	Thu Mar 16 12:22:30 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>