Mercurial > hg > webaudioevaluationtool

changeset 2793:1076ac62823f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
#133 Add element specific images to musher, horizontal and discrete
author Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
date Sun, 23 Apr 2017 10:39:02 +0100
parents 2adc6d20ac0b
children b4e91500891a
files interfaces/discrete.js interfaces/horizontal-sliders.js interfaces/mushra.js
diffstat 3 files changed, 33 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/interfaces/discrete.js	Sun Apr 23 10:17:43 2017 +0100
+++ b/interfaces/discrete.js	Sun Apr 23 10:39:02 2017 +0100
@@ -137,7 +137,9 @@
         document.getElementById("pageTitle").textContent = interfaceObj.title;
     }
 
-    if (interfaceObj.image !== undefined) {
+    if (interfaceObj.image !== undefined || audioHolderObject.audioElements.some(function (elem) {
+            return elem.image !== undefined;
+        })) {
         document.getElementById("testContent").insertBefore(interfaceContext.imageHolder.root, document.getElementById("slider"));
         interfaceContext.imageHolder.setImage(interfaceObj.image);
     }
@@ -344,6 +346,9 @@
             $('.track-slider-button').attr("disabled", "true");
         }
         interfaceContext.commentBoxes.highlightById(audioObject.id);
+        if (audioObject.specification.image !== undefined) {
+            interfaceContext.imageHolder.setImage(audioObject.specification.image);
+        }
     };
     this.stopPlayback = function () {
         // Called by audioObject when playback stops
@@ -359,6 +364,11 @@
             if (box) {
                 box.highlight(false);
             }
+            if (audioObject.specification.parent.interfaces[0].image !== undefined) {
+                interfaceContext.imageHolder.setImage(audioObject.specification.parent.interfaces[0].image);
+            } else {
+                interfaceContext.imageHolder.setImage("");
+            }
         }
     };
 
--- a/interfaces/horizontal-sliders.js	Sun Apr 23 10:17:43 2017 +0100
+++ b/interfaces/horizontal-sliders.js	Sun Apr 23 10:39:02 2017 +0100
@@ -137,7 +137,9 @@
         document.getElementById("pageTitle").textContent = interfaceObj.title;
     }
 
-    if (interfaceObj.image !== undefined) {
+    if (interfaceObj.image !== undefined || audioHolderObject.audioElements.some(function (elem) {
+            return elem.image !== undefined;
+        })) {
         document.getElementById("testContent").insertBefore(interfaceContext.imageHolder.root, document.getElementById("slider"));
         interfaceContext.imageHolder.setImage(interfaceObj.image);
     }
@@ -302,6 +304,9 @@
             $(outsideReference).removeClass('track-slider-playing');
         }
         interfaceContext.commentBoxes.highlightById(audioObject.id);
+        if (audioObject.specification.image !== undefined) {
+            interfaceContext.imageHolder.setImage(audioObject.specification.image);
+        }
     };
     this.stopPlayback = function () {
         // Called when playback has stopped. This gets called even if playback never started!
@@ -313,6 +318,11 @@
         if (box) {
             box.highlight(false);
         }
+        if (audioObject.specification.parent.interfaces[0].image !== undefined) {
+            interfaceContext.imageHolder.setImage(audioObject.specification.parent.interfaces[0].image);
+        } else {
+            interfaceContext.imageHolder.setImage("");
+        }
     };
     this.getValue = function () {
         // Return the current value of the object. If there is no value, return 0
--- a/interfaces/mushra.js	Sun Apr 23 10:17:43 2017 +0100
+++ b/interfaces/mushra.js	Sun Apr 23 10:39:02 2017 +0100
@@ -137,7 +137,9 @@
         document.getElementById("pageTitle").textContent = interfaceObj.title;
     }
 
-    if (interfaceObj.image !== undefined) {
+    if (interfaceObj.image !== undefined || audioHolderObject.audioElements.some(function (elem) {
+            return elem.image !== undefined;
+        })) {
         document.getElementById("testContent").insertBefore(interfaceContext.imageHolder.root, document.getElementById("slider"));
         interfaceContext.imageHolder.setImage(interfaceObj.image);
     }
@@ -343,6 +345,9 @@
                 });
             }
         }
+        if (audioObject.specification.image !== undefined) {
+            interfaceContext.imageHolder.setImage(audioObject.specification.image);
+        }
     };
     this.stopPlayback = function () {
         // Called when playback has stopped. This gets called even if playback never started!
@@ -359,6 +364,11 @@
         if (box) {
             box.highlight(false);
         }
+        if (audioObject.specification.parent.interfaces[0].image !== undefined) {
+            interfaceContext.imageHolder.setImage(audioObject.specification.parent.interfaces[0].image);
+        } else {
+            interfaceContext.imageHolder.setImage("");
+        }
     };
     this.getValue = function () {
         return this.slider.value;