Mercurial > hg > webaudioevaluationtool

changeset 2762:23868d69c452

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' into vnext
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Wed, 19 Apr 2017 10:27:32 +0100
parents 4bf2f7627cdb (current diff) d999a8fc26ea (diff)
children bc9016b5d32f
files
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/interfaces/AB.js	Wed Apr 19 09:30:47 2017 +0100
+++ b/interfaces/AB.js	Wed Apr 19 10:27:32 2017 +0100
@@ -288,7 +288,7 @@
             if (this.parent.specification.parent.playOne || specification.playOne) {
                 $('.comparator-button').text('Wait');
                 $('.comparator-button').attr("disabled", "true");
-                $(this.playback).css("disabled", "false");
+                $(this.playback).removeAttr("disabled");
             } else {
                 $('.comparator-button').text('Listen');
             }
@@ -298,9 +298,13 @@
         };
         this.stopPlayback = function () {
             if (this.playback.getAttribute("playstate") == "playing") {
-                $('.comparator-button').text('Listen');
-                $('.comparator-button').removeAttr("disabled");
+                $(this.playback).text('Listen');
+                $(this.playback).removeAttr("disabled");
                 this.playback.setAttribute("playstate", "ready");
+                if (this.parent.specification.parent.playOne || specification.playOne) {
+                    $('.comparator-button').text('Listen');
+                    $('.comparator-button').removeAttr("disabled");
+                }
             }
             var box = interfaceContext.commentBoxes.boxes.find(function (a) {
                 return a.id === audioElement.id;