Skip to content

Commit

Permalink
#301 ssl makes no difference to Firefox?
Browse files Browse the repository at this point in the history
  • Loading branch information
totaam committed May 14, 2024
1 parent 0b6a092 commit 5271a4f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
7 changes: 2 additions & 5 deletions html5/connect.html
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,7 @@ <h4 class="panel-title">Advanced options</h4>
const DEFAULT_ON = [
"steal",
"printing",
"clipboard",
"file_transfer",
"reconnect",
"floating_menu",
Expand Down Expand Up @@ -1662,13 +1663,9 @@ <h4 class="panel-title">Advanced options</h4>
"debug_audio",
"debug_network",
];
const default_on = DEFAULT_ON.slice();
if (!(Utilities.isSafari() && ssl)) {
default_on.push("clipboard");
}
for (let i = 0; i < bool_props.length; i++) {
const prop = bool_props[i];
const def = default_on.includes(prop);
const def = DEFAULT_ON.includes(prop);
document.getElementById(prop).checked = getboolparam(prop, def);
}
//scroll_reverse_y has 3 options: Yes, No, Auto
Expand Down
7 changes: 5 additions & 2 deletions html5/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -776,11 +776,14 @@ <h2>Xpra Bug Report</h2>
const ignore_audio_blacklist = getboolparam("ignore_audio_blacklist", false);
const keyboard = getboolparam("keyboard", Utilities.isMobile());
// 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 cpoll = !Utilities.isFirefox();
if (Utilities.isSafari()) {
cpoll = !ssl;
}
const clipboard_poll = getboolparam("clipboard_poll", cpoll);
const printing = getboolparam("printing", true);
const file_transfer = getboolparam("file_transfer", true);
const steal = getboolparam("steal", true);
Expand Down

0 comments on commit 5271a4f

Please sign in to comment.