safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-10 07:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-589: Fix regression in clipboard support - do not handle Ctrl-V unless clipboard integration is actually enabled.

Browse Source
This commit is contained in:
Michael Jumper
2014-03-28 15:00:06 -07:00
parent e44ea62d83
commit 84b505dcb7
4 changed files with 74 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
guacamole/src/main/webapp/scripts/client-ui.js
View File

@@ -254,7 +254,9 @@ GuacUI.Client = {
"connectionName" : "Guacamole",
"overrideAutoFit" : false,
"attachedClient" : null
"attachedClient" : null,
"clipboard_integration_enabled" : undefined,
};
@@ -1310,25 +1312,61 @@ GuacUI.Client.attach = function(guac) {
};
/**
* Returns the contents of the remote clipboard if clipboard integration is
* enabled, and null otherwise.
*/
function get_clipboard_data() {
// If integration not enabled, do not attempt retrieval
if (GuacUI.Client.clipboard_integration_enabled === false)
return null;
// Otherwise, attempt retrieval and update integration status
try {
var data = GuacamoleService.Clipboard.get();
GuacUI.Client.clipboard_integration_enabled = true;
return data;
}
catch (status) {
GuacUI.Client.clipboard_integration_enabled = false;
return null;
}
}
// Set local clipboard contents on cut
document.body.addEventListener("cut", function handle_cut(e) {
e.preventDefault();
var data = GuacamoleService.Clipboard.get();
e.clipboardData.setData("text/plain", data);
var data = get_clipboard_data();
if (data !== null) {
e.preventDefault();
e.clipboardData.setData("text/plain", data);
}
}, false);
// Set local clipboard contents on copy
document.body.addEventListener("copy", function handle_copy(e) {
e.preventDefault();
var data = GuacamoleService.Clipboard.get();
e.clipboardData.setData("text/plain", data);
var data = get_clipboard_data();
if (data !== null) {
e.preventDefault();
e.clipboardData.setData("text/plain", data);
}
}, false);
// Set remote clipboard contents on paste
document.body.addEventListener("paste", function handle_paste(e) {
e.preventDefault();
if (GuacUI.Client.attachedClient)
GuacUI.Client.attachedClient.setClipboard(e.clipboardData.getData("text/plain"));
// If status of clipboard integration is unknown, attempt to define it
if (GuacUI.Client.clipboard_integration_enabled === undefined)
get_clipboard_data();
// Override and handle paste only if integration is enabled
if (GuacUI.Client.clipboard_integration_enabled) {
e.preventDefault();
if (GuacUI.Client.attachedClient)
GuacUI.Client.attachedClient.setClipboard(e.clipboardData.getData("text/plain"));
}
}, false);
/*