# HG changeset patch # User Nicholas Jillings # Date 1493047312 -3600 # Node ID 50bc3d714601e8e27ce6905327195ab1005f1eb5 # Parent 1954075487ed6292dc807c12afc1f44312129568 #138 Added page fixed image to timline. Fixed minor typos to discrete and horizontal diff -r 1954075487ed -r 50bc3d714601 interfaces/discrete.js --- 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")); diff -r 1954075487ed -r 50bc3d714601 interfaces/horizontal-sliders.js --- 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")); diff -r 1954075487ed -r 50bc3d714601 interfaces/timeline.js --- 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 = ""; diff -r 1954075487ed -r 50bc3d714601 media/TEA/TEA-anchor-2.wav Binary file media/TEA/TEA-anchor-2.wav has changed