jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KASM-2075 fix seamless clipboard on touch (#22) 

Co-authored-by: matt <matt@kasmweb.com>
This commit is contained in:
mmcclaskey 2021-11-09 14:01:11 -05:00 committed by GitHub
parent b5a1586c0a
commit 170cb81f6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/ui.js
View File

@ -1197,14 +1197,6 @@ const UI = {
setTimeout(UI.showOverlay.bind(this, msg, secs), 200);
},
// Enter and focus events come when we return to NoVNC.
// In both cases, check the local clipboard to see if it changed.
focusVNC: function() {
UI.copyFromLocalClipboard();
},
enterVNC: function() {
UI.copyFromLocalClipboard();
},
copyFromLocalClipboard: function copyFromLocalClipboard() {
if (!document.hasFocus()) {
Log.Debug("window does not have focus");
@ -1225,30 +1217,6 @@ const UI = {
}
},
// These 3 events indicate the focus has gone outside the NoVNC.
// When outside the NoVNC, the system clipboard could change.
leaveVNC: function() {
UI.needToCheckClipboardChange = true;
},
blurVNC: function() {
UI.needToCheckClipboardChange = true;
},
focusoutVNC: function() {
UI.needToCheckClipboardChange = true;
},
// On these 2 events, check if we need to look at clipboard.
mouseMoveVNC: function() {
if ( UI.needToCheckClipboardChange ) {
UI.copyFromLocalClipboard();
}
},
mouseDownVNC: function() {
if ( UI.needToCheckClipboardChange ) {
UI.copyFromLocalClipboard();
}
},
clipboardClear() {
document.getElementById('noVNC_clipboard_text').value = "";
UI.rfb.clipboardPasteFrom("");
@ -1330,17 +1298,6 @@ const UI = {
UI.rfb.addEventListener("capabilities", UI.updatePowerButton);
UI.rfb.addEventListener("clipboard", UI.clipboardReceive);
UI.rfb.addEventListener("bottleneck_stats", UI.bottleneckStatsRecieve);
if (!isTouchDevice) {
document.addEventListener('mouseenter', UI.enterVNC);
document.addEventListener('mouseleave', UI.leaveVNC);
document.addEventListener('focusout', UI.focusoutVNC);
document.addEventListener('mousemove', UI.mouseMoveVNC);
document.addEventListener('mousedown', UI.mouseDownVNC);
document.addEventListener('blur', UI.blurVNC);
document.addEventListener('focus', UI.focusVNC);
}
UI.rfb.addEventListener("bell", UI.bell);
UI.rfb.addEventListener("desktopname", UI.updateDesktopName);
UI.rfb.translateShortcuts = UI.getSetting('translate_shortcuts');
@ -1973,9 +1930,8 @@ const UI = {
keepVirtualKeyboard(event) {
const input = document.getElementById('noVNC_keyboardinput');
if ( UI.needToCheckClipboardChange ) {
UI.copyFromLocalClipboard();
}
UI.copyFromLocalClipboard();
// Only prevent focus change if the virtual keyboard is active
if (document.activeElement != input) {