proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-09 02:38:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

switch over default console viewer to xterm.js

Browse Source 
at least where possible, this affects mostly the node shell button.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-06-25 17:10:31 +02:00
parent 8fb3bf9845
commit da9d14cd7a
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/manager6/Utils.js
View File

@ -404,7 +404,7 @@ Ext.define('PVE.Utils', { utilities: {
}, },
console_map: { console_map: {
'__default__': Proxmox.Utils.defaultText + ' (HTML5)', '__default__': Proxmox.Utils.defaultText + ' (xterm.js)',
'vv': 'SPICE (remote-viewer)', 'vv': 'SPICE (remote-viewer)',
'html5': 'HTML5 (noVNC)', 'html5': 'HTML5 (noVNC)',
'xtermjs': 'xterm.js' 'xtermjs': 'xterm.js'
@ -945,10 +945,9 @@ Ext.define('PVE.Utils', { utilities: {
allowSpice = consoles.spice; allowSpice = consoles.spice;
allowXtermjs = !!consoles.xtermjs; allowXtermjs = !!consoles.xtermjs;
} }
var vncdefault = 'html5'; var dv = PVE.VersionInfo.console || 'xtermjs';
var dv = PVE.VersionInfo.console || vncdefault;
if ((dv === 'vv' && !allowSpice) || (dv === 'xtermjs' && !allowXtermjs)) { if ((dv === 'vv' && !allowSpice) || (dv === 'xtermjs' && !allowXtermjs)) {
dv = vncdefault; dv = 'html5';
} }
return dv; return dv;