Mercurial > hg > webaudioevaluationtool
changeset 2801:50bc3d714601
#138 Added page fixed image to timline. Fixed minor typos to discrete and horizontal
| author | Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk> |
|---|---|
| date | Mon, 24 Apr 2017 16:21:52 +0100 |
| parents | 1954075487ed |
| children | 586c5cac6e7f |
| files | interfaces/discrete.js interfaces/horizontal-sliders.js interfaces/timeline.js media/TEA/TEA-anchor-2.wav |
| diffstat | 4 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/interfaces/discrete.js Mon Apr 24 15:49:58 2017 +0100 +++ b/interfaces/discrete.js Mon Apr 24 16:21:52 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 Mon Apr 24 15:49:58 2017 +0100 +++ b/interfaces/horizontal-sliders.js Mon Apr 24 16:21:52 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 Mon Apr 24 15:49:58 2017 +0100 +++ b/interfaces/timeline.js Mon Apr 24 16:21:52 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 = "";