From f23c60e0a3b9b20739747d62dd78a0b5857c0902 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 19 Jun 2015 09:08:08 +0200
Subject: [PATCH] GUI: always use noVNC instead of java applet

---
 www/manager/Utils.js         | 6 ++----
 www/manager/dc/OptionView.js | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/www/manager/Utils.js b/www/manager/Utils.js
index a716fc47..76328222 100644
--- a/www/manager/Utils.js
+++ b/www/manager/Utils.js
@@ -233,11 +233,9 @@ Ext.define('PVE.Utils', { statics: {
     render_console_viewer: function(value) {
 	if (!value) {
 	    return PVE.Utils.defaultText + ' (HTML5)';
-	} else if (value === 'applet') {
-	    return 'Java VNC Applet';
 	} else if (value === 'vv') {
 	    return  'SPICE (remote-viewer)';
-	} else if (value === 'html5') {
+	} else if (value === 'applet' || value === 'html5') {
 	    return  'HTML5 (noVNC)';
 	} else {
 	    return value;
@@ -946,7 +944,7 @@ Ext.define('PVE.Utils', { statics: {
 	}
 
 	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') {
 	    var url;
 	    var params = { proxy: PVE.Utils.windowHostname() };
diff --git a/www/manager/dc/OptionView.js b/www/manager/dc/OptionView.js
index 81eab6f2..9e33e328 100644
--- a/www/manager/dc/OptionView.js
+++ b/www/manager/dc/OptionView.js
@@ -53,7 +53,7 @@ Ext.define('PVE.dc.ConsoleViewerEdit', {
 
 	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)]);
 	});