proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-07-17 20:13:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: always use noVNC instead of java applet

Browse Source
This commit is contained in:
Dietmar Maurer 2015-06-19 09:08:08 +02:00
parent 31349069ed
commit f23c60e0a3
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/manager/Utils.js
View File

@ -233,11 +233,9 @@ Ext.define('PVE.Utils', { statics: {
render_console_viewer: function(value) { render_console_viewer: function(value) {
if (!value) { if (!value) {
return PVE.Utils.defaultText + ' (HTML5)'; return PVE.Utils.defaultText + ' (HTML5)';
} else if (value === 'applet') {
return 'Java VNC Applet';
} else if (value === 'vv') { } else if (value === 'vv') {
return 'SPICE (remote-viewer)'; return 'SPICE (remote-viewer)';
} else if (value === 'html5') { } else if (value === 'applet' || value === 'html5') {
return 'HTML5 (noVNC)'; return 'HTML5 (noVNC)';
} else { } else {
return value; return value;
@ -946,7 +944,7 @@ Ext.define('PVE.Utils', { statics: {
} }
if (viewer === 'applet' || viewer === 'html5') { if (viewer === 'applet' || viewer === 'html5') {
PVE.Utils.openVNCViewer(vmtype, vmid, nodename, vmname, viewer === 'html5'); PVE.Utils.openVNCViewer(vmtype, vmid, nodename, vmname, true);
} else if (viewer === 'vv') { } else if (viewer === 'vv') {
var url; var url;
var params = { proxy: PVE.Utils.windowHostname() }; var params = { proxy: PVE.Utils.windowHostname() };

2
www/manager/dc/OptionView.js
View File

@ -53,7 +53,7 @@ Ext.define('PVE.dc.ConsoleViewerEdit', {
var data = []; var data = [];
Ext.Array.each(['', 'applet', 'vv', 'html5'], function(value) { Ext.Array.each(['', 'vv', 'html5'], function(value) {
data.push([value, PVE.Utils.render_console_viewer(value)]); data.push([value, PVE.Utils.render_console_viewer(value)]);
}); });