Skip to content

Commit

Permalink
Copy paste NoVNC chrome (#335)
Browse files Browse the repository at this point in the history
NoVNC mod for streamlined copy/paste in chrome novnc/noVNC#1301

If clipboard-read permission results in TypeError we just ignore it
that way if in the future Firefox or other browser defines clipboard.readText but
does not support the read permission we don't get a bunch of console warnings
  • Loading branch information
ericfranz authored Dec 10, 2019
1 parent 17454ce commit 26a265a
Showing 1 changed file with 59 additions and 0 deletions.
59 changes: 59 additions & 0 deletions apps/dashboard/public/noVNC-1.0.0/app.v1.js
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,8 @@ var UI = {
document.getElementById("noVNC_clipboard_button").addEventListener('click', UI.toggleClipboardPanel);
document.getElementById("noVNC_clipboard_text").addEventListener('change', UI.clipboardSend);
document.getElementById("noVNC_clipboard_clear_button").addEventListener('click', UI.clipboardClear);

document.getElementById("noVNC_clipboard_text").addEventListener('input', UI.syncClipboardPanelToLocalClipboard);
},

// Add a call to save settings when the element changes,
Expand Down Expand Up @@ -1052,6 +1054,49 @@ var UI = {
* CLIPBOARD
* ------v------*/

// Read and write text to local clipboard is currently only supported in Chrome 66+ and Opera53+
// further information at https://developer.mozilla.org/en-US/docs/Web/API/Clipboard

writeLocalClipboard(text) {
if (typeof navigator.clipboard !== "undefined" && typeof navigator.clipboard.writeText !== "undefined" &&
typeof navigator.permissions !== "undefined" && typeof navigator.permissions.query !== "undefined"
) {
navigator.permissions.query({name: 'clipboard-write'})
.then(() => navigator.clipboard.writeText(text))
.then(() => {
let debugMessage = text.substr(0, 40) + "...";
Log.Debug('>> UI.setClipboardText: navigator.clipboard.writeText with ' + debugMessage);
})
.catch((err) => {
if(err.name !== 'TypeError'){
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" &&
typeof navigator.permissions !== "undefined" && typeof navigator.permissions.query !== "undefined"
) {
navigator.permissions.query({name: 'clipboard-read'})
.then(() => 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) => {
if(err.name !== 'TypeError'){
Log.Warn("<< UI.readLocalClipboard: Failed to read system clipboard-: " + err);
}
});
}
},

openClipboardPanel: function () {
UI.closeAllPanels();
UI.openControlbar();
Expand All @@ -1076,11 +1121,13 @@ var UI = {
clipboardReceive: function (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: function () {
document.getElementById('noVNC_clipboard_text').value = "";
UI.writeLocalClipboard("");
UI.rfb.clipboardPasteFrom("");
},

Expand All @@ -1090,6 +1137,12 @@ var UI = {
UI.rfb.clipboardPasteFrom(text);
Log.Debug("<< UI.clipboardSend");
},
syncClipboardPanelToLocalClipboard() {
// Reads text from clipboard panel and set it to local clipboard
// Mainly used to synchronize clipboard panel with local clipboard
const text = document.getElementById('noVNC_clipboard_text').value;
UI.writeLocalClipboard(text);
},

/* ------^-------
* /CLIPBOARD
Expand Down Expand Up @@ -1159,6 +1212,9 @@ var UI = {
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');
Expand Down Expand Up @@ -6468,6 +6524,8 @@ function RFB(target, url, options) {
// time to set up callbacks
setTimeout(this._updateConnectionState.bind(this, 'connecting'));

this.oncanvasfocus = () => {}; // Handler for canvas focused

Log.Debug("<< RFB.constructor");
};

Expand Down Expand Up @@ -6615,6 +6673,7 @@ RFB.prototype = {
},

focus: function () {
this.oncanvasfocus();
this._canvas.focus();
},

Expand Down

0 comments on commit 26a265a

Please sign in to comment.