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

Auto copy-paste with navigator.clipboard API 

Co-authored-by: bulldozier <kentdozier@gmail.com>
This commit is contained in:
akamos 2019-09-25 10:03:04 +02:00
parent 9886d5951d
commit bec4cba887
3 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/ui.js
View File

@ -915,6 +915,32 @@ const UI = {
* CLIPBOARD
* ------v------*/
writeLocalClipboard(text) {
if (typeof navigator.clipboard !== "undefined" && typeof navigator.clipboard.readText !== "undefined") {
navigator.clipboard.writeText(text).then(() => {
let debugMessage = text.substr(0, 40) + "...";
Log.Debug('>> UI.setClipboardText: navigator.clipboard.writeText with ' + debugMessage);
}).catch(() => {
Log.Error(">> UI.setClipboardText: Failed to write system clipboard (trying to copy from NoVNC clipboard)");
});
}
},
readLocalClipboard() {
// navigator.clipboard and navigator.clipbaord.readText is not available in all browsers
if (typeof navigator.clipboard !== "undefined" && typeof navigator.clipboard.readText !== "undefined") {
navigator.clipboard.readText()
.then((clipboardText) => {
const text = document.getElementById('noVNC_clipboard_text').value;
if (clipboardText !== text) {
document.getElementById('noVNC_clipboard_text').value = clipboardText;
UI.clipboardSend();
}
})
.catch(err => Log.Warn("<< UI.readLocalClipboard: Failed to read system clipboard-: " + err));
}
},
openClipboardPanel() {
UI.closeAllPanels();
UI.openControlbar();
@ -944,17 +970,20 @@ const UI = {
clipboardReceive(e) {
Log.Debug(">> UI.clipboardReceive: " + e.detail.text.substr(0, 40) + "...");
document.getElementById('noVNC_clipboard_text').value = e.detail.text;
UI.writeLocalClipboard(e.detail.text);
Log.Debug("<< UI.clipboardReceive");
},
clipboardClear() {
document.getElementById('noVNC_clipboard_text').value = "";
UI.writeLocalClipboard("");
UI.rfb.clipboardPasteFrom("");
},
clipboardSend() {
const text = document.getElementById('noVNC_clipboard_text').value;
Log.Debug(">> UI.clipboardSend: " + text.substr(0, 40) + "...");
UI.writeLocalClipboard(text);
UI.rfb.clipboardPasteFrom(text);
Log.Debug("<< UI.clipboardSend");
},
@ -1028,6 +1057,9 @@ const UI = {
UI.rfb.addEventListener("securityfailure", UI.securityFailed);
UI.rfb.addEventListener("capabilities", UI.updatePowerButton);
UI.rfb.addEventListener("clipboard", UI.clipboardReceive);
UI.rfb.oncanvasfocus = UI.readLocalClipboard;
UI.rfb.addEventListener("bell", UI.bell);
UI.rfb.addEventListener("desktopname", UI.updateDesktopName);
UI.rfb.clipViewport = UI.getSetting('view_clip');

3
core/rfb.js
View File

@ -234,6 +234,8 @@ export default class RFB extends EventTargetMixin {
// time to set up callbacks
setTimeout(this._updateConnectionState.bind(this, 'connecting'));
this.oncanvasfocus = () => {}; // Handler for canvas focused
Log.Debug("<< RFB.constructor");
// ===== PROPERTIES =====
@ -381,6 +383,7 @@ export default class RFB extends EventTargetMixin {
}
focus() {
this.oncanvasfocus();
this._canvas.focus();
}

2
tests/test.rfb.js
View File

@ -270,8 +270,10 @@ describe('Remote Frame Buffer Protocol Client', function () {
describe('#focus', function () {
it('should move focus to canvas object', function () {
client._canvas.focus = sinon.spy();
client.oncanvasfocus = sinon.spy();
client.focus();
expect(client._canvas.focus).to.have.been.calledOnce;
expect(client.oncanvasfocus).to.have.been.calledOnce;
});
});