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 426B7B9654 for ; Mon, 11 Dec 2023 11:20:28 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 153B514739 for ; Mon, 11 Dec 2023 11:19:58 +0100 (CET) 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 for ; Mon, 11 Dec 2023 11:19:57 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3F3BF44F40 for ; Mon, 11 Dec 2023 11:19:57 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 11 Dec 2023 11:19:56 +0100 Message-Id: <20231211101956.2381823-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.018 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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] fix #5063: load webgl addon in try block 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, 11 Dec 2023 10:20:28 -0000 since under certain circumstances (e.g. using safari < 16) the addon constructor already throws an exception, not only the loading later. To allow falling back to the canvas renderer, move it into the try block after webgl detection. This should fix the xterm.js console on iOS in chrome and other browsers. Signed-off-by: Dominik Csapak --- xterm.js/src/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xterm.js/src/main.js b/xterm.js/src/main.js index 1575697..289032c 100644 --- a/xterm.js/src/main.js +++ b/xterm.js/src/main.js @@ -99,7 +99,6 @@ var terminalContainer = document.getElementById('terminal-container'); document.getElementById('status_bar').addEventListener('click', hideMsg); document.getElementById('connect_btn').addEventListener('click', startGuest); const fitAddon = new FitAddon.FitAddon(); -const webglAddon = new WebglAddon.WebglAddon(); createTerminal(); @@ -157,6 +156,7 @@ function createTerminal() { let loadedWebgl = false; try { if (detectWebgl()) { + const webglAddon = new WebglAddon.WebglAddon(); term.loadAddon(webglAddon); loadedWebgl = true; } -- 2.30.2