Mercurial > hg > webaudioevaluationtool

changeset 3014:cae294cb0242

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' into vnext
author Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
date Wed, 06 Sep 2017 18:44:58 +0100
parents 3342bc1f3256 (current diff) 796daa52e3f8 (diff)
children 7eb029906f81 209532a650da
files
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/interfaces/ABX.js	Wed Sep 06 14:50:00 2017 +0100
+++ b/interfaces/ABX.js	Wed Sep 06 18:44:58 2017 +0100
@@ -271,6 +271,9 @@
         };
         this.updateLoading = function (progress) {
             // progress is a value from 0 to 100 indicating the current download state of media files
+            if (label == "X" || label == "x") {
+                this.playback.textContent = "Play";
+            }
             if (progress != 100) {
                 progress = String(progress);
                 progress = progress.split('.')[0];
@@ -335,6 +338,9 @@
         this.error = function () {
             // If there is an error with the audioObject, this will be called to indicate a failure
         };
+        if (label == "X" || label == "x") {
+            this.enable();
+        }
     };
     // Ensure there are only two comparisons per page
     if (page.audioElements.length != 2) {