#301 keep clipboard, disable polling

Xpra-org · May 14, 2024 · 8f8de0d · 8f8de0d
1 parent eb54346
commit 8f8de0d
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/html5/index.html b/html5/index.html
@@ -780,10 +780,12 @@ <h2>Xpra Bug Report</h2>
           false
         );
         const keyboard = getboolparam("keyboard", Utilities.isMobile());
-        //Safari and navigator.clipboard don't mix well:
-        //(only enabled with ssl contexts)
-        //https://github.com/Xpra-org/xpra-html5/issues/226
-        const clipboard = getboolparam("clipboard", ssl || !Utilities.isSafari());
+        // Some browsers trigger ugly popups if we try to read the clipboard
+        // (only enabled with ssl contexts)
+        // Safari: https://github.com/Xpra-org/xpra-html5/issues/226
+        // Firefox: https://github.com/Xpra-org/xpra-html5/issues/301
+        const clipboard = getboolparam("clipboard", true);
+        const clipboard_poll = getboolparam("clipboard_poll", ssl || !(Utilities.isSafari() || Utilities.isFirefox()));
         const printing = getboolparam("printing", true);
         const file_transfer = getboolparam("file_transfer", true);
         const steal = getboolparam("steal", true);
@@ -894,6 +896,7 @@ <h2>Xpra Bug Report</h2>
         client.sharing = sharing;
         client.insecure = insecure;
         client.clipboard_enabled = clipboard;
+        client.clipboard_poll = clipboard_poll;
         client.printing = printing;
         client.file_transfer = file_transfer;
         client.bandwidth_limit = bandwidth_limit;
@@ -1076,6 +1079,7 @@ <h2>Xpra Bug Report</h2>
                 audio_codec: audio_codec,
                 keyboard: keyboard,
                 clipboard: clipboard,
+                clipboard_poll: clipboard_poll,
                 printing: printing,
                 file_transfer: file_transfer,
                 exit_with_children: exit_with_children,