From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id DE43D6DF7B for ; Mon, 28 Mar 2022 15:08:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CE6D925E4F for ; Mon, 28 Mar 2022 15:07:46 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 4923825E45 for ; Mon, 28 Mar 2022 15:07:46 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 227EE40B30 for ; Mon, 28 Mar 2022 15:07:46 +0200 (CEST) From: Matthias Heiserer To: pve-devel@lists.proxmox.com Date: Mon, 28 Mar 2022 15:07:37 +0200 Message-Id: <20220328130737.2961451-4-m.heiserer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220328130737.2961451-1-m.heiserer@proxmox.com> References: <20220328130737.2961451-1-m.heiserer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.006 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v2 manager] ui: tree-wide: use new AltText button X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Mar 2022 13:08:16 -0000 text is not needed with the AltText button. Signed-off-by: Matthias Heiserer --- www/manager6/lxc/Resources.js | 18 +----------------- www/manager6/qemu/HardwareView.js | 18 +----------------- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.js index 15ee3c67..96dc43a1 100644 --- a/www/manager6/lxc/Resources.js +++ b/www/manager6/lxc/Resources.js @@ -189,8 +189,7 @@ Ext.define('PVE.lxc.RessourceView', { handler: run_resize, }); - var remove_btn = new Proxmox.button.Button({ - text: gettext('Remove'), + var remove_btn = new Proxmox.button.AltText({ defaultText: gettext('Remove'), altText: gettext('Detach'), selModel: me.selModel, @@ -210,21 +209,6 @@ Ext.define('PVE.lxc.RessourceView', { return msg; }, handler: run_remove, - listeners: { - render: function(btn) { - // hack: calculate the max button width on first display to prevent the whole - // toolbar to move when we switch between the "Remove" and "Detach" labels - let def = btn.getSize().width; - - btn.setText(btn.altText); - let alt = btn.getSize().width; - - btn.setText(btn.defaultText); - - let optimal = alt > def ? alt : def; - btn.setSize({ width: optimal }); - }, - }, }); var move_btn = new Proxmox.button.Button({ diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js index 6cea4287..a95da1dc 100644 --- a/www/manager6/qemu/HardwareView.js +++ b/www/manager6/qemu/HardwareView.js @@ -438,8 +438,7 @@ Ext.define('PVE.qemu.HardwareView', { handler: run_move, }); - var remove_btn = new Proxmox.button.Button({ - text: gettext('Remove'), + var remove_btn = new Proxmox.button.AltText({ defaultText: gettext('Remove'), altText: gettext('Detach'), selModel: sm, @@ -485,21 +484,6 @@ Ext.define('PVE.qemu.HardwareView', { }, }); }, - listeners: { - render: function(btn) { - // hack: calculate the max button width on first display to prevent the whole - // toolbar to move when we switch between the "Remove" and "Detach" labels - var def = btn.getSize().width; - - btn.setText(btn.altText); - var alt = btn.getSize().width; - - btn.setText(btn.defaultText); - - var optimal = alt > def ? alt : def; - btn.setSize({ width: optimal }); - }, - }, }); var revert_btn = new PVE.button.PendingRevert({ -- 2.30.2