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
Pin test page cleanup
[matches/MCTX3420.git]
/
testing
/
MCTXWeb
/
public_html
/
static
/
mctx.gui.js
diff --git
a/testing/MCTXWeb/public_html/static/mctx.gui.js
b/testing/MCTXWeb/public_html/static/mctx.gui.js
index
a9e8ae7
..
606c0be
100644
(file)
--- a/
testing/MCTXWeb/public_html/static/mctx.gui.js
+++ b/
testing/MCTXWeb/public_html/static/mctx.gui.js
@@
-22,7
+22,8
@@
mctx.sensors = {
2 : {name : "Strain gauge 3"},
3 : {name : "Strain gauge 4"},
4 : {name : "Pressure sensor 1"},
2 : {name : "Strain gauge 3"},
3 : {name : "Strain gauge 4"},
4 : {name : "Pressure sensor 1"},
- 5 : {name : "Pressure sensor 2"}
+ 5 : {name : "Pressure sensor 2"},
+ 6 : {name : "Pressure sensor 3"}
};
mctx.actuators = {
};
mctx.actuators = {
@@
-187,6
+188,9
@@
$.fn.setErrorLog = function () {
var updater = function () {
$.ajax({url : url}).done(function (data) {
outdiv.text(data);
var updater = function () {
$.ajax({url : url}).done(function (data) {
outdiv.text(data);
+ outdiv.scrollTop(
+ outdiv[0].scrollHeight - outdiv.height()
+ );
setTimeout(updater, 1000);
}).fail(function (jqXHR) {
outdiv.text("Failed to retrieve the error log.");
setTimeout(updater, 1000);
}).fail(function (jqXHR) {
outdiv.text("Failed to retrieve the error log.");
@@
-194,4
+198,8
@@
$.fn.setErrorLog = function () {
};
updater();
};
updater();
-};
\ No newline at end of file
+};
+
+$(document).ajaxError(function (event, jqXHR) {
+ //console.log("AJAX query failed with: " + jqXHR.status + " (" + jqXHR.statusText + ")");
+});
\ No newline at end of file
UCC
git Repository :: git.ucc.asn.au