Mercurial > hg > webaudioevaluationtool
changeset 2625:e3cf3c24149e
Including samediff into global label-maker (34b20b6)
Merge branch 'master' into vnext
# Conflicts:
# interfaces/AB.js
| author | Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk> |
|---|---|
| date | Thu, 19 Jan 2017 10:47:42 +0000 |
| parents | a33b66ca3baa (current diff) 03a9a90717ed (diff) |
| children | f41389149eab |
| files | interfaces/AB.js interfaces/timeline.js js/core.js xml/test-schema.xsd |
| diffstat | 3 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/interfaces/timeline.js Wed Jan 18 14:54:12 2017 +0000 +++ b/interfaces/timeline.js Thu Jan 19 10:47:42 2017 +0000 @@ -55,8 +55,8 @@ submit.id = 'submit-button'; submit.style.float = 'left'; // Append the interface buttons into the interfaceButtons object. + interfaceButtons.appendChild(submit); interfaceButtons.appendChild(playback); - interfaceButtons.appendChild(submit); // Create outside reference holder var outsideRef = document.createElement("div");
--- a/js/core.js Wed Jan 18 14:54:12 2017 +0000 +++ b/js/core.js Thu Jan 19 10:47:42 2017 +0000 @@ -3270,6 +3270,14 @@ return String.fromCharCode((index + offset) % 26 + 97); case "capital": return String.fromCharCode((index + offset) % 26 + 65); + case "samediff": + if (index == 0) { + return "Same"; + } else if (index == 1) { + return "Difference"; + } else { + return ""; + } case "number": return String(index + offset); default:
--- a/xml/test-schema.xsd Wed Jan 18 14:54:12 2017 +0000 +++ b/xml/test-schema.xsd Thu Jan 19 10:47:42 2017 +0000 @@ -93,6 +93,7 @@ <xs:enumeration value="number" /> <xs:enumeration value="letter" /> <xs:enumeration value="capital" /> + <xs:enumeration value="samediff" /> </xs:restriction> </xs:simpleType> </xs:attribute>