From 6ad5f9f2c6ab934946518800f5879d7ca81241bf Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Mon, 11 Dec 2017 14:30:54 +0100 Subject: [PATCH] replace novnc with xtermjs Signed-off-by: Dominik Csapak --- js/ServerAdministration.js | 2 +- js/ServerStatus.js | 2 +- js/Utils.js | 11 ----------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/js/ServerAdministration.js b/js/ServerAdministration.js index 8f09360..7237578 100644 --- a/js/ServerAdministration.js +++ b/js/ServerAdministration.js @@ -42,7 +42,7 @@ Ext.define('PMG.ServerAdministration', { disabled: true, text: gettext('Upgrade'), handler: function() { - PMG.Utils.openVNCViewer('upgrade', Proxmox.NodeName); + Proxmox.Utils.openXtermJsViewer('upgrade', 0, Proxmox.NodeName); } }, itemId: 'updates', diff --git a/js/ServerStatus.js b/js/ServerStatus.js index 8ff793b..de85050 100644 --- a/js/ServerStatus.js +++ b/js/ServerStatus.js @@ -21,7 +21,7 @@ Ext.define('PMG.ServerStatus', { { text: gettext("Console"), handler: function() { - PMG.Utils.openVNCViewer('shell', Proxmox.NodeName); + Proxmox.Utils.openXtermJsViewer('shell', 0, Proxmox.NodeName); } }, '->', diff --git a/js/Utils.js b/js/Utils.js index 43558e7..dbc3e78 100644 --- a/js/Utils.js +++ b/js/Utils.js @@ -627,17 +627,6 @@ Ext.define('PMG.Utils', { } }, - openVNCViewer: function(consoletype, nodename) { - var url = Ext.urlEncode({ - console: consoletype, // upgrade or shell - novnc: 1, - node: nodename - }); - var nw = window.open("?" + url, '_blank', - "innerWidth=745,innerheight=427"); - nw.focus(); - }, - updateLoginData: function(data) { Proxmox.CSRFPreventionToken = data.CSRFPreventionToken; Proxmox.UserName = data.username; -- 2.39.2