summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
7cb345b)
if not available for a vm, we fallback to novnc like with spice
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
+ console_map: {
+ '__default__': Proxmox.Utils.defaultText + ' (HTML5)',
+ 'vv': 'SPICE (remote-viewer)',
+ 'html5': 'HTML5 (noVNC)',
+ 'xtermjs': 'xterm.js',
+ },
+
render_console_viewer: function(value) {
render_console_viewer: function(value) {
- if (!value || value === '__default__') {
- return Proxmox.Utils.defaultText + ' (HTML5)';
- } else if (value === 'vv') {
- return 'SPICE (remote-viewer)';
- } else if (value === 'html5') {
- return 'HTML5 (noVNC)';
- } else {
- return value;
+ value = value || '__default__';
+ if (PVE.Utils.console_map[value]) {
+ return PVE.Utils.console_map[value];
},
console_viewer_array: function() {
},
console_viewer_array: function() {
- return Ext.Array.map(['__default__','vv', 'html5'], function(v) {
+ return Ext.Array.map(Object.keys(PVE.Utils.console_map), function(v) {
return [v, PVE.Utils.render_console_viewer(v)];
});
},
return [v, PVE.Utils.render_console_viewer(v)];
});
},
function(m, addr, offset, original) { return addr; });
},
function(m, addr, offset, original) { return addr; });
},
- openDefaultConsoleWindow: function(allowSpice, vmtype, vmid, nodename, vmname) {
- var dv = PVE.Utils.defaultViewer(allowSpice);
+ openDefaultConsoleWindow: function(consoles, vmtype, vmid, nodename, vmname) {
+ var dv = PVE.Utils.defaultViewer(consoles);
PVE.Utils.openConsoleWindow(dv, vmtype, vmid, nodename, vmname);
},
PVE.Utils.openConsoleWindow(dv, vmtype, vmid, nodename, vmname);
},
- defaultViewer: function(allowSpice) {
+ defaultViewer: function(consoles) {
+
+ var allowSpice, allowXtermjs;
+
+ if (consoles === true) {
+ allowSpice = true;
+ allowXtermjs = true;
+ } else if (typeof consoles === 'object') {
+ allowSpice = consoles.spice;
+ allowXtermjs = consoles.xtermjs;
+ }
var vncdefault = 'html5';
var dv = PVE.VersionInfo.console || vncdefault;
var vncdefault = 'html5';
var dv = PVE.VersionInfo.console || vncdefault;
- if (dv === 'vv' && !allowSpice) {
+ if ((dv === 'vv' && !allowSpice) || (dv === 'xtermjs' && !allowXtermjs)) {
handler: function() {
var me = this;
handler: function() {
var me = this;
- PVE.Utils.openDefaultConsoleWindow(me.enableSpice, me.consoleType, me.vmid,
+ var consoles = {
+ spice: me.enableSpice,
+ xtermjs: me.enableXtermjs
+ };
+ PVE.Utils.openDefaultConsoleWindow(consoles, me.consoleType, me.vmid,
me.nodename, me.consoleName);
},
me.nodename, me.consoleName);
},
},
success: function(response, opts) {
var allowSpice = response.result.data.spice;
},
success: function(response, opts) {
var allowSpice = response.result.data.spice;
- PVE.Utils.openDefaultConsoleWindow(allowSpice, 'kvm', vmid, nodename, vmname);
+ var allowXtermjs = response.result.data.serial;
+ var consoles = {
+ spice: allowSpice,
+ xtermjs: allowXtermjs
+ };
+ PVE.Utils.openDefaultConsoleWindow(consoles, 'kvm', vmid, nodename, vmname);