Skip to content

Commit 33d2abb

Browse files
committed
Fixed errors for .directComandExec() in the Display Viewer.
1 parent 6ad9718 commit 33d2abb

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

src/htdocs/websage.js

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,6 +1281,9 @@ else
12811281
}
12821282
}
12831283

1284+
var ackCmdElem;
1285+
if (WebSAGE.g_win_cmd && WebSAGE.g_win_cmd.document && WebSAGE.g_win_cmd.document.getElementById)
1286+
ackCmdElem = WebSAGE.g_win_cmd.document.getElementById("ACK_CMD");
12841287
fetchTimeout("/Invoke/", 1500, {
12851288
method: "POST",
12861289
body: JSON.stringify(req),
@@ -1296,19 +1299,22 @@ else
12961299
if ( (!data.ServiceId || !data.Body || !data.Body.ResponseHeader || !data.Body.ResponseHeader.RequestHandle || !data.Body.Results) ||
12971300
(data.ServiceId !== OpcServiceCode.WriteResponse || data.Body.ResponseHeader.RequestHandle !== RequestHandle) ||
12981301
(data.Body.ResponseHeader.ServiceResult !== OpcStatusCodes.Good)) {
1299-
CNPTO = 0;
1300-
WebSAGE.g_win_cmd.document.getElementById("ACK_CMD").textContent = "Error!";
1302+
CNPTO = 0;
1303+
if (ackCmdElem)
1304+
ackCmdElem.textContent = "Error!";
13011305
return;
13021306
}
13031307
if ( data.Body.Results[0] !== OpcStatusCodes.Good ){
13041308
CNPTO = 0;
1305-
WebSAGE.g_win_cmd.document.getElementById("ACK_CMD").textContent = "Error!";
1309+
if (ackCmdElem)
1310+
ackCmdElem.textContent = "Error!";
13061311
}
1307-
1312+
13081313
// success
1309-
WebSAGE.g_win_cmd.document.getElementById("ACK_CMD").textContent = " ... ";
1314+
if (ackCmdElem)
1315+
ackCmdElem.textContent = " ... ";
13101316
CHANDLE = data.Body._CommandHandles[0];
1311-
1317+
13121318
// Command log in browser's localStorage
13131319
if (storageAvailable("localStorage")) {
13141320
var lastlogcnt = 0;
@@ -1323,9 +1329,10 @@ else
13231329
})
13241330
.catch(err => {
13251331
CNPTO = 0;
1326-
WebSAGE.g_win_cmd.document.getElementById("ACK_CMD").textContent = "Error!";
1332+
if (ackCmdElem)
1333+
ackCmdElem.textContent = "Error!";
13271334
});
1328-
},
1335+
},
13291336

13301337
executeCommand: function(cmd_val) {
13311338
WebSAGE.directCommandExec(CNPTO, cmd_val);

0 commit comments

Comments
 (0)