# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1493110364 -3600
# Node ID 622671f2ac13e207db0297067547143e3a06ae85
# Parent  586c5cac6e7f0e87ad6e0f312421239fd844a77f# Parent  74b0a1be28a7175b9d000baa69e750e051cc5947
Merge branch 'vnext' into Dev_main

diff -r 74b0a1be28a7 -r 622671f2ac13 interfaces/discrete.js
--- a/interfaces/discrete.js	Tue Apr 25 09:52:30 2017 +0100
+++ b/interfaces/discrete.js	Tue Apr 25 09:52:44 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 74b0a1be28a7 -r 622671f2ac13 interfaces/horizontal-sliders.js
--- a/interfaces/horizontal-sliders.js	Tue Apr 25 09:52:30 2017 +0100
+++ b/interfaces/horizontal-sliders.js	Tue Apr 25 09:52:44 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 74b0a1be28a7 -r 622671f2ac13 interfaces/timeline.js
--- a/interfaces/timeline.js	Tue Apr 25 09:52:30 2017 +0100
+++ b/interfaces/timeline.js	Tue Apr 25 09:52:44 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 74b0a1be28a7 -r 622671f2ac13 media/TEA/TEA-anchor-2.wav
Binary file media/TEA/TEA-anchor-2.wav has changed