Mercurial > hg > webaudioevaluationtool
changeset 2803:586c5cac6e7f
Merge branch 'vnext' into Dev_main
| author | Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk> |
|---|---|
| date | Tue, 25 Apr 2017 09:45:23 +0100 |
| parents | 50bc3d714601 (diff) e9ac2a297ba3 (current diff) |
| children | 622671f2ac13 |
| files | |
| diffstat | 4 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/interfaces/discrete.js Tue Apr 25 09:45:10 2017 +0100 +++ b/interfaces/discrete.js Tue Apr 25 09:45:23 2017 +0100 @@ -137,7 +137,7 @@ document.getElementById("pageTitle").textContent = interfaceObj.title; } - if (interfaceObj.image !== undefined || audioHolderObject.audioElements.some(function (elem) { + if (interfaceObj.image !== undefined || page.audioElements.some(function (elem) { return elem.image !== undefined; })) { document.getElementById("testContent").insertBefore(interfaceContext.imageHolder.root, document.getElementById("slider"));
--- a/interfaces/horizontal-sliders.js Tue Apr 25 09:45:10 2017 +0100 +++ b/interfaces/horizontal-sliders.js Tue Apr 25 09:45:23 2017 +0100 @@ -137,7 +137,7 @@ document.getElementById("pageTitle").textContent = interfaceObj.title; } - if (interfaceObj.image !== undefined || audioHolderObject.audioElements.some(function (elem) { + if (interfaceObj.image !== undefined || page.audioElements.some(function (elem) { return elem.image !== undefined; })) { document.getElementById("testContent").insertBefore(interfaceContext.imageHolder.root, document.getElementById("slider"));
--- a/interfaces/timeline.js Tue Apr 25 09:45:10 2017 +0100 +++ b/interfaces/timeline.js Tue Apr 25 09:45:23 2017 +0100 @@ -98,6 +98,13 @@ document.getElementById("page-title").textContent = interfaceObj.title; } + if (interfaceObj.image !== undefined || page.audioElements.some(function (elem) { + return elem.image !== undefined; + })) { + document.getElementById("testContent").insertBefore(interfaceContext.imageHolder.root, document.getElementById("timeline-test-content")); + interfaceContext.imageHolder.setImage(interfaceObj.image); + } + // Delete outside reference var outsideReferenceHolder = document.getElementById("outside-reference-holder"); outsideReferenceHolder.innerHTML = "";