5
0
mirror of git://git.proxmox.com/git/novnc-pve.git synced 2024-12-22 17:34:20 +03:00

fix #3882: backport firefox workaround for ResizeObserver

it's a minor but annoying issue, and novnc does not release that often,
so backport the patch

also rebases our patches on top

we can drop this with the next novnc release

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2022-02-11 14:57:21 +01:00 committed by Thomas Lamprecht
parent 18fa9537f1
commit ae5331307a
4 changed files with 40 additions and 8 deletions

View File

@ -11,7 +11,7 @@ Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
1 file changed, 15 insertions(+), 2 deletions(-) 1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/app/error-handler.js b/app/error-handler.js diff --git a/app/error-handler.js b/app/error-handler.js
index 81a6cba..6ce8013 100644 index f956c22..20233b2 100644
--- a/app/error-handler.js --- a/app/error-handler.js
+++ b/app/error-handler.js +++ b/app/error-handler.js
@@ -15,6 +15,18 @@ @@ -15,6 +15,18 @@
@ -33,7 +33,7 @@ index 81a6cba..6ce8013 100644
// Fallback for all uncought errors // Fallback for all uncought errors
function handleError(event, err) { function handleError(event, err) {
@@ -52,8 +64,9 @@ @@ -58,8 +70,9 @@
msg.appendChild(div); msg.appendChild(div);
} }

View File

@ -13,8 +13,8 @@ colors were adapted
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
--- ---
app/pve.js | 34 ++++++++++++++++++++++++-- app/pve.js | 34 +++++++++++++++++++++++++--
app/styles/pve.css | 58 +++++++++++++++++++++++++++++++++++++++++++++ app/styles/pve.css | 58 ++++++++++++++++++++++++++++++++++++++++++++++
vnc.html | 9 +++++++ vnc.html | 9 +++++++
3 files changed, 99 insertions(+), 2 deletions(-) 3 files changed, 99 insertions(+), 2 deletions(-)
@ -78,7 +78,7 @@ index 042eb7c..9da23ed 100644
var me = this; var me = this;
try { try {
diff --git a/app/styles/pve.css b/app/styles/pve.css diff --git a/app/styles/pve.css b/app/styles/pve.css
index 18126b0..f2e7484 100644 index 18126b0..e0ca61f 100644
--- a/app/styles/pve.css --- a/app/styles/pve.css
+++ b/app/styles/pve.css +++ b/app/styles/pve.css
@@ -44,3 +44,61 @@ @@ -44,3 +44,61 @@
@ -144,10 +144,10 @@ index 18126b0..f2e7484 100644
+ padding: 0 5px 2px 0; + padding: 0 5px 2px 0;
+} +}
diff --git a/vnc.html b/vnc.html diff --git a/vnc.html b/vnc.html
index d94fd99..72efa89 100644 index 3e63087..f0488b1 100644
--- a/vnc.html --- a/vnc.html
+++ b/vnc.html +++ b/vnc.html
@@ -283,6 +283,15 @@ @@ -281,6 +281,15 @@
</div> </div>
</div> </div>

View File

@ -0,0 +1,31 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Mon, 22 Nov 2021 13:53:05 +0100
Subject: [PATCH] Ignore ResizeObserver errors
It seems that Firefox has a bug where these are fired incorrectly when
we are in an <iframe>. The events also contain no useful details, so we
can't really do anything useful with them anyway.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
app/error-handler.js | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/app/error-handler.js b/app/error-handler.js
index 81a6cba..f956c22 100644
--- a/app/error-handler.js
+++ b/app/error-handler.js
@@ -21,6 +21,12 @@
try {
const msg = document.getElementById('noVNC_fallback_errormsg');
+ // Work around Firefox bug:
+ // https://bugzilla.mozilla.org/show_bug.cgi?id=1685038
+ if (event.message === "ResizeObserver loop completed with undelivered notifications.") {
+ return false;
+ }
+
// Only show the initial error
if (msg.hasChildNodes()) {
return false;

View File

@ -1,3 +1,4 @@
extra/0001-Ignore-ResizeObserver-errors.patch
0001-add-PVE-specific-JS-code.patch 0001-add-PVE-specific-JS-code.patch
0002-add-custom-fbresize-event-on-rfb.patch 0002-add-custom-fbresize-event-on-rfb.patch
0003-change-scaling-when-toggling-fullscreen.patch 0003-change-scaling-when-toggling-fullscreen.patch