MyFavMirrors
/
MeshCentral
mirror of https://github.com/Ylianst/MeshCentral.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4809 from gary-kim/fix/noid/xterm-write 

Fix xterm in shared terminals
This commit is contained in:
Ylian Saint-Hilaire 2022-11-24 01:53:45 -08:00 committed by GitHub
parent ed3fb2013a 4e24783662
commit f85f6f29d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
views/sharing-mobile.handlebars
View File

@ -1670,7 +1670,13 @@
return obj; return obj;
} }
function tunnelUpdate(data) { if (typeof data == 'string') { xterm.writeUtf8(data); } else { xterm.writeUtf8(new Uint8Array(data)); } } function tunnelUpdate(data) {
if (xterm.writeUtf8) {
if (typeof data == 'string') { xterm.writeUtf8(data); } else { xterm.writeUtf8(new Uint8Array(data)); }
} else {
if (typeof data == 'string') { xterm.write(data); } else { xterm.write(new Uint8Array(data)); }
}
}
function sshTunnelUpdate(data) { function sshTunnelUpdate(data) {
if (typeof data == 'string') { if (typeof data == 'string') {

12
views/sharing.handlebars
View File

@ -393,7 +393,7 @@
} }
function deskAdjust() { function deskAdjust() {
if ((xxcurrentView == 12) && (terminal != null) && (xtermfit != null)) { xtermfit.fit(); } // Terminal if ((xxcurrentView == 12) && (terminal != null) && (xtermfit != null)) { xtermfit.fit(); } // Terminal
QS('fileArea4')['height'] = 'calc(100vh - ' + (90 + Q('fileArea2').clientHeight) + 'px)'; // Files QS('fileArea4')['height'] = 'calc(100vh - ' + (90 + Q('fileArea2').clientHeight) + 'px)'; // Files
var parentH = Q('DeskParent').clientHeight, parentW = Q('DeskParent').clientWidth; var parentH = Q('DeskParent').clientHeight, parentW = Q('DeskParent').clientWidth;
var deskH = Q('Desk').height, deskW = Q('Desk').width; var deskH = Q('Desk').height, deskW = Q('Desk').width;
@ -1405,7 +1405,13 @@
return obj; return obj;
} }
function tunnelUpdate(data) { if (typeof data == 'string') { xterm.writeUtf8(data); } else { xterm.writeUtf8(new Uint8Array(data)); } } function tunnelUpdate(data) {
if (xterm.writeUtf8) {
if (typeof data == 'string') { xterm.writeUtf8(data); } else { xterm.writeUtf8(new Uint8Array(data)); }
} else {
if (typeof data == 'string') { xterm.write(data); } else { xterm.write(new Uint8Array(data)); }
}
}
// Send the new terminal size to the agent // Send the new terminal size to the agent
function xTermSendResize() { function xTermSendResize() {
@ -1567,7 +1573,7 @@
// //
// Files // Files
// //
function setupFiles() { function setupFiles() {
// Setup the files tab // Setup the files tab