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 7859271345 for ; Tue, 18 May 2021 14:13:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5C4C9F055 for ; Tue, 18 May 2021 14:12:44 +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 2D1B5F00F for ; Tue, 18 May 2021 14:12:42 +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 EFA41465DA for ; Tue, 18 May 2021 14:12:41 +0200 (CEST) From: =?UTF-8?q?Dominic=20J=C3=A4ger?= To: pve-devel@lists.proxmox.com Date: Tue, 18 May 2021 14:12:16 +0200 Message-Id: <20210518121218.125661-5-d.jaeger@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210518121218.125661-1-d.jaeger@proxmox.com> References: <20210518121218.125661-1-d.jaeger@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.954 Adjusted score from AWL reputation of From: address 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 Subject: [pve-devel] [PATCH manager 4/6] Remove useless escapes 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: Tue, 18 May 2021 12:13:14 -0000 Signed-off-by: Dominic Jäger --- www/manager6/lxc/DNS.js | 2 +- www/manager6/qemu/CloudInit.js | 2 +- www/manager6/qemu/USBEdit.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/manager6/lxc/DNS.js b/www/manager6/lxc/DNS.js index f277370c..6c519023 100644 --- a/www/manager6/lxc/DNS.js +++ b/www/manager6/lxc/DNS.js @@ -13,7 +13,7 @@ Ext.define('PVE.lxc.DNSInputPanel', { } if (values.nameserver) { - var list = values.nameserver.split(/[\ \,\;]+/); + let list = values.nameserver.split(/[ ,;]+/); values.nameserver = list.join(' '); } else if (!me.insideWizard) { deletes.push('nameserver'); diff --git a/www/manager6/qemu/CloudInit.js b/www/manager6/qemu/CloudInit.js index 8465b402..77ff93d4 100644 --- a/www/manager6/qemu/CloudInit.js +++ b/www/manager6/qemu/CloudInit.js @@ -86,7 +86,7 @@ Ext.define('PVE.qemu.CloudInit', { var insert_params = {}; let disk = PVE.Parser.parseQemuDrive(view.ciDriveId, view.ciDrive); var storage = ''; - var stormatch = disk.file.match(/^([^\:]+)\:/); + var stormatch = disk.file.match(/^([^:]+):/); if (stormatch) { storage = stormatch[1]; } diff --git a/www/manager6/qemu/USBEdit.js b/www/manager6/qemu/USBEdit.js index 6a8b93bd..a2204584 100644 --- a/www/manager6/qemu/USBEdit.js +++ b/www/manager6/qemu/USBEdit.js @@ -149,11 +149,11 @@ Ext.define('PVE.qemu.USBEdit', { var type = 'spice'; for (let i = 0; i < data.length; i++) { - if (/^(host=)?(0x)?[a-zA-Z0-9]{4}\:(0x)?[a-zA-Z0-9]{4}$/.test(data[i])) { + if (/^(host=)?(0x)?[a-zA-Z0-9]{4}:(0x)?[a-zA-Z0-9]{4}$/.test(data[i])) { hostdevice = data[i]; hostdevice = hostdevice.replace('host=', '').replace('0x', ''); type = 'hostdevice'; - } else if (/^(host=)?(\d+)\-(\d+(\.\d+)*)$/.test(data[i])) { + } else if (/^(host=)?(\d+)-(\d+(\.\d+)*)$/.test(data[i])) { port = data[i]; port = port.replace('host=', ''); type = 'port'; -- 2.20.1