Merge pull request #83 from jtanx/master

[matches/MCTX3420.git] / testing / MCTXWeb / public_html / static / mctx.control.js

diff --git a/testing/MCTXWeb/public_html/static/mctx.control.js b/testing/MCTXWeb/public_html/static/mctx.control.js
index d3b5348..212f708 100644 (file)
--- a/testing/MCTXWeb/public_html/static/mctx.control.js
+++ b/testing/MCTXWeb/public_html/static/mctx.control.js
@@ -21,6 +21,7 @@ function toggleControls(running) {
     $("#start-widget").hide();
   } else {
     $("#start-widget").show();
+    $("#start-widget input").removeAttr("disabled");
     $("#experiment-stop").hide();
     $("#pressure-widget").hide();
   }
@@ -153,7 +154,8 @@ $.fn.startExperiment = function (group, experiment, force, result) {
    data : data
  }).done(function (data) {
    if (!result.checkStatus(data)) {
-     return;
+    $(group).removeAttr('disabled');
+    return;
    }
    
    //Select the can
@@ -162,6 +164,7 @@ $.fn.startExperiment = function (group, experiment, force, result) {
     data : {name : "can_select", set : can_number}
    }).done(function (data) {
     if (!result.checkStatus(data)) {
+     $(group).removeAttr('disabled');
      return;
     }
     
@@ -171,11 +174,12 @@ $.fn.startExperiment = function (group, experiment, force, result) {
       data : {name : "can_enable", set : 1}
     }).done(function (data) {
       if (!result.checkStatus(data)) {
+        $(group).removeAttr('disabled');
         return;
       }
       result.html(" ");
       toggleControls(true);
-    }).always(function () {
+    }).fail(function () {
       $(group).removeAttr('disabled');
     });
    }).fail(function () {