git.ucc.asn.au
/
matches
/
MCTX3420.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only use POST for login, and only if the GET string is empty
[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
..
f414a82
100644
(file)
--- a/
testing/MCTXWeb/public_html/static/mctx.control.js
+++ b/
testing/MCTXWeb/public_html/static/mctx.control.js
@@
-153,7
+153,8
@@
$.fn.startExperiment = function (group, experiment, force, result) {
data : data
}).done(function (data) {
if (!result.checkStatus(data)) {
data : data
}).done(function (data) {
if (!result.checkStatus(data)) {
- return;
+ $(group).removeAttr('disabled');
+ return;
}
//Select the can
}
//Select the can
@@
-162,6
+163,7
@@
$.fn.startExperiment = function (group, experiment, force, result) {
data : {name : "can_select", set : can_number}
}).done(function (data) {
if (!result.checkStatus(data)) {
data : {name : "can_select", set : can_number}
}).done(function (data) {
if (!result.checkStatus(data)) {
+ $(group).removeAttr('disabled');
return;
}
return;
}
@@
-171,11
+173,12
@@
$.fn.startExperiment = function (group, experiment, force, result) {
data : {name : "can_enable", set : 1}
}).done(function (data) {
if (!result.checkStatus(data)) {
data : {name : "can_enable", set : 1}
}).done(function (data) {
if (!result.checkStatus(data)) {
+ $(group).removeAttr('disabled');
return;
}
result.html(" ");
toggleControls(true);
return;
}
result.html(" ");
toggleControls(true);
- }).
always
(function () {
+ }).
fail
(function () {
$(group).removeAttr('disabled');
});
}).fail(function () {
$(group).removeAttr('disabled');
});
}).fail(function () {
UCC
git Repository :: git.ucc.asn.au