Mercurial > hg > webaudioevaluationtool

changeset 2577:522f58e7773e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Stage
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Tue, 18 Oct 2016 17:51:53 +0100
parents d002a342cfaf
children bf17cc19c1c0
files interfaces/AB.js
diffstat 1 files changed, 0 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/interfaces/AB.js	Tue Oct 18 15:28:24 2016 +0100
+++ b/interfaces/AB.js	Tue Oct 18 17:51:53 2016 +0100
@@ -315,13 +315,8 @@
         this.startPlayback = function () {
             if (this.parent.specification.parent.playOne || specification.playOne) {
                 $('.comparator-button').text('Wait');
-<<<<<<< HEAD
-                $('.comparator-button').attr("disabled","true");
-                $(this.playback).removeAttr("disabled");
-=======
                 $('.comparator-button').attr("disabled", "true");
                 $(this.playback).css("disabled", "false");
->>>>>>> 0425ea2... Formatting of AB. WIP for #37
             } else {
                 $('.comparator-button').text('Listen');
             }