1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-09 15:40:18 +00:00

Invitation link fixes, xTerm terminal title support.

This commit is contained in:
Ylian Saint-Hilaire 2019-06-04 13:01:32 -07:00
parent 769e6b7211
commit ff9e92ccc8
7 changed files with 14194 additions and 13 deletions

View file

@ -525,7 +525,7 @@
<span id="connectbutton2span"><input type="button" id="connectbutton2" value="Connect" onclick=connectTerminal(event,1) onkeypress="return false" onkeydown="return false" disabled="disabled"></span>
<span id="connectbutton2hspan">&nbsp;<input type="button" id="connectbutton2h" value="HW Connect" onclick=connectTerminal(event,2) onkeypress="return false" onkeydown="return false" disabled="disabled"></span>
<span id="disconnectbutton2span">&nbsp;<input type="button" id="disconnectbutton2" value="Disconnect" onclick=connectTerminal(event,0) onkeypress="return false" onkeydown="return false"></span>
&nbsp;<span id="termstatus">Disconnected</span>
&nbsp;<span id="termstatus">Disconnected</span><span id="termtitle"></span>
</div>
</td>
</tr>
@ -5035,12 +5035,10 @@
switch (state) {
case 0:
// Disconnected, clear the terminal
QH('termtitle', '');
xterminal.m.TermResetScreen();
xterminal.m.TermDraw();
if (terminal != null) {
terminal.Stop();
terminal = null;
}
if (terminal != null) { terminal.Stop(); terminal = null; }
break;
case 3:
break;
@ -5063,6 +5061,7 @@
terminal = CreateAmtRedirect(CreateAmtRemoteTerminal('Term'), authCookie);
terminal.debugmode = debugmode;
terminal.m.debugmode = debugmode;
terminal.m.onTitleChange = function (sender, title) { QH('termtitle', ' - ' + EscapeHtml(title)); }
terminal.onStateChanged = onTerminalStateChange;
terminal.Start(terminalNode._id, 16994, '*', '*', 0);
terminal.contype = 2;
@ -5072,6 +5071,7 @@
terminal = CreateAgentRedirect(meshserver, CreateAmtRemoteTerminal('Term'), serverPublicNamePort, authCookie, domainUrl);
terminal.debugmode = debugmode;
terminal.m.debugmode = debugmode;
terminal.m.onTitleChange = function (sender, title) { QH('termtitle', ' - ' + EscapeHtml(title)); }
terminal.m.lineFeed = ([1, 2, 3, 4, 21, 22].indexOf(currentNode.agent.id) >= 0) ? '\r\n' : '\r'; // On windows, send \r\n, on Linux only \r
terminal.attemptWebRTC = attemptWebRTC;
terminal.onStateChanged = onTerminalStateChange;