warden/rlgwebd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

webtty: switch all server responses to JSON.

Browse source
This commit is contained in:
John "Elwin" Edwards 2012-05-11 13:33:48 -07:00
parent 71d43603a9
commit b6bf7038ca
2 changed files with 38 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

45
shterm.js
View file

@ -119,23 +119,20 @@ function getData() {
var datareq = new XMLHttpRequest();
datareq.onreadystatechange = function () {
if (datareq.readyState == 4 && datareq.status == 200) {
var datalines = datareq.responseText.split("\n");
if (!datalines[0]) {
var response = JSON.parse(this.responseText);
if (!response.t)
return;
else if (response.t == "E") {
if (response.c == 1) {
termemu.alive = false;
debug(1, "Server error: " + response.s);
}
}
else if (datalines[0] == "E1") {
termemu.alive = false;
return;
}
else if (datalines[0].charAt(0) != 'd') {
return;
}
if (datalines[1]) {
writeData(datalines[1]);
ajaxstate.gotdata();
}
else {
else if (response.t == "n")
ajaxstate.gotnothing();
else if (response.t == "d") {
writeData(response.d);
ajaxstate.gotdata();
}
return;
}
@ -147,18 +144,21 @@ function getData() {
function postResponseHandler() {
if (this.readyState == 4 && this.status == 200) {
var datalines = this.responseText.split("\n");
if (!datalines[0])
var response = JSON.parse(this.responseText);
if (!response.t || response.t == "n")
return;
else if (datalines[0] == "E1") {
termemu.alive = false;
else if (response.t == "E") {
if (response.c == 1) {
termemu.alive = false;
debug(1, "Server error: " + response.s);
}
return;
}
else if (datalines[0].charAt(0) != "d")
else if (response.t != "d")
return;
/* It is a data message */
if (datalines[1]) {
writeData(datalines[1]);
if (response.d) {
writeData(response.d);
}
ajaxstate.posted();
return;
@ -301,7 +301,6 @@ function login(h, w) {
var req = new XMLHttpRequest();
req.onreadystatechange = function () {
if (req.readyState == 4 && req.status == 200) {
var datalines = req.responseText.split("\n");
var logindict = JSON.parse(req.responseText);
if (logindict.login) {
/* Success */
@ -324,8 +323,8 @@ function stop() {
var req = new XMLHttpRequest();
req.onreadystatechange = function () {
if (req.readyState == 4 && req.status == 200) {
var datalines = req.responseText.split("\n");
/* Figure out whether or not it worked. */
/* FIXME the server might respond with output. */
termemu.alive = false;
return;
}