Assume text inserted in eventTarget at end (cannot rely on selectionStart or selectio...

[guacamole.git] / src / main / webapp / scripts / interface.js

diff --git a/src/main/webapp/scripts/interface.js b/src/main/webapp/scripts/interface.js
index c8d8ee9..9002e7e 100644 (file)
--- a/src/main/webapp/scripts/interface.js
+++ b/src/main/webapp/scripts/interface.js
@@ -145,7 +145,14 @@ var GuacamoleUI = {
             shade_interval = window.setInterval(function() {
 
                 offset -= step;
-                GuacamoleUI.menu.style.top = offset + "px";
+
+                GuacamoleUI.menu.style.transform =
+                GuacamoleUI.menu.style.WebkitTransform =
+                GuacamoleUI.menu.style.MozTransform =
+                GuacamoleUI.menu.style.OTransform =
+                GuacamoleUI.menu.style.msTransform =
+
+                    "translateY(" + offset + "px)";
 
                 if (offset <= -GuacamoleUI.menu.offsetHeight) {
                     window.clearInterval(shade_interval);
@@ -176,7 +183,13 @@ var GuacamoleUI = {
                     window.clearInterval(show_interval);
                 }
 
-                GuacamoleUI.menu.style.top = offset + "px";
+                GuacamoleUI.menu.style.transform =
+                GuacamoleUI.menu.style.WebkitTransform =
+                GuacamoleUI.menu.style.MozTransform =
+                GuacamoleUI.menu.style.OTransform =
+                GuacamoleUI.menu.style.msTransform =
+
+                    "translateY(" + offset + "px)";
 
             }, GuacamoleUI.MENU_SHOW_INTERVAL);
         }
@@ -408,6 +421,10 @@ var GuacamoleUI = {
         }
     };
 
+    // Turn off autocorrect and autocapitalization on eventTarget
+    GuacamoleUI.eventTarget.setAttribute("autocorrect", "off");
+    GuacamoleUI.eventTarget.setAttribute("autocapitalize", "off");
+
 })();
 
 // Tie UI events / behavior to a specific Guacamole client
@@ -487,7 +504,63 @@ GuacamoleUI.attach = function(guac) {
 
     // Keyboard
     var keyboard = new Guacamole.Keyboard(document);
-    var keysymPressed = [];
+
+    // Monitor whether the event target is focused
+    var eventTargetFocused = false;
+
+    // Save length for calculation of changed value
+    var currentLength = GuacamoleUI.eventTarget.value.length;
+
+    GuacamoleUI.eventTarget.onfocus = function() {
+        eventTargetFocused = true;
+        GuacamoleUI.eventTarget.value = "";
+        currentLength = 0;
+    };
+
+    GuacamoleUI.eventTarget.onblur = function() {
+        eventTargetFocused = false;
+    };
+
+    // If text is input directly into event target without typing (as with
+    // voice input, for example), type automatically.
+    GuacamoleUI.eventTarget.oninput = function(e) {
+
+        // Calculate current length and change in length
+        var oldLength = currentLength;
+        currentLength = GuacamoleUI.eventTarget.value.length;
+        
+        // If deleted or replaced text, ignore
+        if (currentLength <= oldLength)
+            return;
+
+        // Get changed text
+        var text = GuacamoleUI.eventTarget.value.substring(oldLength);
+
+        // Send each character
+        for (var i=0; i<text.length; i++) {
+
+            // Get char code
+            var charCode = text.charCodeAt(i);
+
+            // Convert to keysym
+            var keysym = 0x003F; // Default to a question mark
+            if (charCode >= 0x0000 && charCode <= 0x00FF)
+                keysym = charCode;
+            else if (charCode >= 0x0100 && charCode <= 0x10FFFF)
+                keysym = 0x01000000 | charCode;
+
+            // Send keysym only if not already pressed
+            if (!keyboard.pressed[keysym]) {
+
+                // Press and release key
+                guac.sendKeyEvent(1, keysym);
+                guac.sendKeyEvent(0, keysym);
+
+            }
+
+        }
+
+    }
 
     function isTypableCharacter(keysym) {
         return (keysym & 0xFFFF00) != 0xFF00;
@@ -502,14 +575,12 @@ GuacamoleUI.attach = function(guac) {
 
         keyboard.onkeydown = function (keysym) {
             guac.sendKeyEvent(1, keysym);
-            keysymPressed[keysym] = true;
-            return isTypableCharacter(keysym);
+            return eventTargetFocused && isTypableCharacter(keysym);
         };
 
         keyboard.onkeyup = function (keysym) {
             guac.sendKeyEvent(0, keysym);
-            keysymPressed[keysym] = false;
-            return isTypableCharacter(keysym);
+            return eventTargetFocused && isTypableCharacter(keysym);
         };
 
     }
@@ -590,54 +661,6 @@ GuacamoleUI.attach = function(guac) {
         guac.disconnect();
     };
 
-    // Save length for calculation of changed value
-    var currentLength = GuacamoleUI.eventTarget.value.length;
-
-    // If text is input directly into event target without typing (as with
-    // voice input, for example), type automatically.
-    GuacamoleUI.eventTarget.oninput = function(e) {
-
-        // Calculate current length and change in length
-        var newLength = GuacamoleUI.eventTarget.value.length;
-        var changeLength = newLength - currentLength;
-        currentLength = newLength;
-        
-        // If deleted or replaced text, ignore
-        if (changeLength <= 0)
-            return;
-
-        // Get changed text
-        var text = GuacamoleUI.eventTarget.value.substring(
-            GuacamoleUI.eventTarget.selectionStart,
-            GuacamoleUI.eventTarget.selectionStart + changeLength
-        );
-
-        // Send each character
-        for (var i=0; i<text.length; i++) {
-
-            // Get char code
-            var charCode = text.charCodeAt(i);
-
-            // Convert to keysym
-            var keysym = 0x003F; // Default to a question mark
-            if (charCode >= 0x0000 && charCode <= 0x00FF)
-                keysym = charCode;
-            else if (charCode >= 0x0100 && charCode <= 0x10FFFF)
-                keysym = 0x01000000 | charCode;
-
-            // Send keysym only if not already pressed
-            if (!keysymPressed[keysym]) {
-
-                // Press and release key
-                guac.sendKeyEvent(1, keysym);
-                guac.sendKeyEvent(0, keysym);
-
-            }
-
-        }
-
-    }
-
     // Handle clipboard events
     GuacamoleUI.clipboard.onchange = function() {