]> git.proxmox.com Git - mirror_novnc.git/commitdiff
Change name of clipboard functions
authorsamhed <samuel@cendio.se>
Tue, 26 Apr 2016 22:31:50 +0000 (00:31 +0200)
committerSamuel Mannehed <samuel@cendio.se>
Fri, 27 May 2016 14:11:47 +0000 (16:11 +0200)
There were a high risk of confusion between clipboard functions and
clipping functions.

include/ui.js

index e04c0f5059d780abf198e127d8e10accc1dd6faf..7a8600a9b560baa045f112339e0aec0c5a4be3fd 100644 (file)
@@ -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");
         },
 
 /* ------^-------