From f72909609933b72e3f4cde25fc74c2c1909f68f2 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Mon, 17 May 2021 19:58:52 +0200
Subject: [PATCH] ui: buttons: eslint fixes and code cleanup/refactoring

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 www/manager6/button/ConsoleButton.js | 47 +++++++++++++++++++---------
 www/manager6/button/Split.js         |  4 ++-
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/www/manager6/button/ConsoleButton.js b/www/manager6/button/ConsoleButton.js
index 9d117041..62928e47 100644
--- a/www/manager6/button/ConsoleButton.js
+++ b/www/manager6/button/ConsoleButton.js
@@ -33,14 +33,31 @@ Ext.define('PVE.button.ConsoleButton', {
 	me.down('#xtermjs').setDisabled(!enable);
     },
 
-    handler: function() {
-	var me = this;
-	var consoles = {
-	    spice: me.enableSpice,
-	    xtermjs: me.enableXtermjs,
-	};
-	PVE.Utils.openDefaultConsoleWindow(consoles, me.consoleType, me.vmid,
-					   me.nodename, me.consoleName, me.cmd);
+    handler: function() { // main, general, handler
+	let me = this;
+	PVE.Utils.openDefaultConsoleWindow(
+	    {
+		spice: me.enableSpice,
+		xtermjs: me.enableXtermjs,
+	    },
+	    me.consoleType,
+	    me.vmid,
+	    me.nodename,
+	    me.consoleName,
+	    me.cmd,
+	);
+    },
+
+    openConsole: function(types) { // used by split-menu buttons
+	let me = this;
+	PVE.Utils.openConsoleWindow(
+	    types,
+	    me.consoleType,
+	    me.vmid,
+	    me.nodename,
+	    me.consoleName,
+	    me.cmd,
+	);
     },
 
     menu: [
@@ -50,8 +67,8 @@ Ext.define('PVE.button.ConsoleButton', {
 	    iconCls: 'pve-itype-icon-novnc',
 	    type: 'html5',
 	    handler: function(button) {
-		var me = this.up('button');
-		PVE.Utils.openConsoleWindow(button.type, me.consoleType, me.vmid, me.nodename, me.consoleName, me.cmd);
+		let view = this.up('button');
+		view.openConsole(button.type);
 	    },
 	},
 	{
@@ -61,8 +78,8 @@ Ext.define('PVE.button.ConsoleButton', {
 	    type: 'vv',
 	    iconCls: 'pve-itype-icon-virt-viewer',
 	    handler: function(button) {
-		var me = this.up('button');
-		PVE.Utils.openConsoleWindow(button.type, me.consoleType, me.vmid, me.nodename, me.consoleName, me.cmd);
+		let view = this.up('button');
+		view.openConsole(button.type);
 	    },
 	},
 	{
@@ -71,14 +88,14 @@ Ext.define('PVE.button.ConsoleButton', {
 	    iconCls: 'pve-itype-icon-xtermjs',
 	    type: 'xtermjs',
 	    handler: function(button) {
-		var me = this.up('button');
-		PVE.Utils.openConsoleWindow(button.type, me.consoleType, me.vmid, me.nodename, me.consoleName, me.cmd);
+		let view = this.up('button');
+		view.openConsole(button.type);
 	    },
 	},
     ],
 
     initComponent: function() {
-        var me = this;
+        let me = this;
 
 	if (!me.nodename) {
 	    throw "no node name specified";
diff --git a/www/manager6/button/Split.js b/www/manager6/button/Split.js
index ea001dbb..090571de 100644
--- a/www/manager6/button/Split.js
+++ b/www/manager6/button/Split.js
@@ -12,7 +12,9 @@ Ext.define('PVE.button.Split', {
     selModel: undefined,
 
     // if 'false' handler will not be called (button disabled)
-    enableFn: function(record) { },
+    enableFn: function(record) {
+	// do nothing
+    },
 
     // function(record) or text
     confirmMsg: false,