# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1489666950 0
# Node ID 7b1dfb582637b1eb10cb49958d6e0ff869fc67cf
# Parent  3a0be105ee85a486d0e5a2598c827ce4242ebdc5# Parent  29672fa03c7573e1b28c241bbdc74913682384fc
Merge branch 'master' into vnext

diff -r 3a0be105ee85 -r 7b1dfb582637 interfaces/AB.js
--- 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': {
diff -r 3a0be105ee85 -r 7b1dfb582637 xml/test-schema.xsd
--- 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>