summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsamhed <samuel@cendio.se>2016-04-27 00:31:50 +0200
committerSamuel Mannehed <samuel@cendio.se>2016-05-27 16:11:47 +0200
commit4d26f58e0d711144ec6bcdabf26811db1c457238 (patch)
tree7ebd63571b5a62b25e35e6bd4e88045c625c3bc0
parent95dd60011c4097a0b7408a429fe68518576d24d2 (diff)
downloadnovnc-4d26f58e0d711144ec6bcdabf26811db1c457238.tar.gz
Change name of clipboard functions
There were a high risk of confusion between clipboard functions and clipping functions.
-rw-r--r--include/ui.js20
1 files changed, 10 insertions, 10 deletions
diff --git a/include/ui.js b/include/ui.js
index e04c0f5..7a8600a 100644
--- a/include/ui.js
+++ b/include/ui.js
@@ -187,7 +187,7 @@ var UI;
UI.rfb = new RFB({'target': $D('noVNC_canvas'),
'onUpdateState': UI.updateState,
'onXvpInit': UI.updateXvpButton,
- 'onClipboard': UI.clipReceive,
+ 'onClipboard': UI.clipboardReceive,
'onFBUComplete': UI.initialResize,
'onFBResize': UI.updateViewDrag,
'onDesktopName': UI.updateDocumentTitle});
@@ -233,8 +233,8 @@ var UI;
$D("noVNC_clipboard_text").onfocus = UI.displayBlur;
$D("noVNC_clipboard_text").onblur = UI.displayFocus;
- $D("noVNC_clipboard_text").onchange = UI.clipSend;
- $D("noVNC_clipboard_clear_button").onclick = UI.clipClear;
+ $D("noVNC_clipboard_text").onchange = UI.clipboardSend;
+ $D("noVNC_clipboard_clear_button").onclick = UI.clipboardClear;
$D("noVNC_settings_menu").onmouseover = UI.displayBlur;
$D("noVNC_settings_menu").onmouseover = UI.displayFocus;
@@ -637,22 +637,22 @@ var UI;
}
},
- clipReceive: function(rfb, text) {
- Util.Debug(">> UI.clipReceive: " + text.substr(0,40) + "...");
+ clipboardReceive: function(rfb, text) {
+ Util.Debug(">> UI.clipboardReceive: " + text.substr(0,40) + "...");
$D('noVNC_clipboard_text').value = text;
- Util.Debug("<< UI.clipReceive");
+ Util.Debug("<< UI.clipboardReceive");
},
- clipClear: function() {
+ clipboardClear: function() {
$D('noVNC_clipboard_text').value = "";
UI.rfb.clipboardPasteFrom("");
},
- clipSend: function() {
+ clipboardSend: function() {
var text = $D('noVNC_clipboard_text').value;
- Util.Debug(">> UI.clipSend: " + text.substr(0,40) + "...");
+ Util.Debug(">> UI.clipboardSend: " + text.substr(0,40) + "...");
UI.rfb.clipboardPasteFrom(text);
- Util.Debug("<< UI.clipSend");
+ Util.Debug("<< UI.clipboardSend");
},
/* ------^-------