Mercurial > hg > webaudioevaluationtool
changeset 2715:23f84278dc2a
Merge branch 'vnext' into Dev_main
# Conflicts:
# js/core.js
| author | Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk> |
|---|---|
| date | Fri, 14 Apr 2017 16:06:37 +0100 |
| parents | eece6007daa5 (current diff) 52224b9d6e8b (diff) |
| children | 57ba3f490836 |
| files | js/core.js |
| diffstat | 2 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/js/specification.js Fri Mar 31 10:47:27 2017 +0100 +++ b/js/specification.js Fri Apr 14 16:06:37 2017 +0100 @@ -527,6 +527,7 @@ this.interfaces = []; this.playOne = undefined; this.restrictMovement = undefined; + this.position = undefined; this.commentBoxPrefix = "Comment on track"; this.audioElements = []; this.commentQuestions = [];
--- a/xml/test-schema.xsd Fri Mar 31 10:47:27 2017 +0100 +++ b/xml/test-schema.xsd Fri Apr 14 16:06:37 2017 +0100 @@ -100,6 +100,7 @@ <xs:attribute name="labelStart" type="xs:string" use="optional" default="" /> <xs:attribute ref="poolSize" /> <xs:attribute ref="alwaysInclude" /> + <xs:attribute name="position" use="optional" type="xs:nonNegativeInteger" /> <xs:attribute ref="preSilence" /> <xs:attribute ref="postSilence" /> <xs:attribute ref="playOne" />