From 39720019cd56e61be22a63523b0d20b9b91766ae Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Tue, 20 May 2014 14:28:53 -0700
Subject: [PATCH] GUAC-701: Lessen aggressiveness of text input UI. Disable
 autoeverything.

---
 guacamole/src/main/webapp/scripts/client-ui.js | 18 ++++++++----------
 guacamole/src/main/webapp/styles/client.css    |  1 +
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/guacamole/src/main/webapp/scripts/client-ui.js b/guacamole/src/main/webapp/scripts/client-ui.js
index 2316d8211..ab2a02ac3 100644
--- a/guacamole/src/main/webapp/scripts/client-ui.js
+++ b/guacamole/src/main/webapp/scripts/client-ui.js
@@ -1587,6 +1587,9 @@ GuacUI.Client.attach = function(guac) {
 
     function __update_layout() {
 
+        // Reset scroll and reposition document such that it's on-screen
+        window.scrollTo(document.body.scrollWidth, document.body.scrollHeight);
+
         // Only reflow if size or scroll have changed
         if (document.body.scrollTop  != last_scroll_top
          || document.body.scrollLeft != last_scroll_left
@@ -1598,9 +1601,6 @@ GuacUI.Client.attach = function(guac) {
             last_width = window.innerWidth;
             last_height = window.innerHeight;
 
-            // Reposition document such that it's back on-screen
-            window.scrollTo(document.body.scrollWidth, document.body.scrollHeight);
-
             // Determine height of bottom section (currently only text input)
             var bottom = GuacUI.Client.text_input.container;
             var bottom_height = (bottom && bottom.offsetHeight) | 0;
@@ -1947,8 +1947,11 @@ GuacUI.Client.attach = function(guac) {
      * Text input
      */
 
-    // Disable automatic capitalization on platforms that support this attribute
+    // Disable automatic input features on platforms that support these attributes
     GuacUI.Client.text_input.target.setAttribute("autocapitalize", "off");
+    GuacUI.Client.text_input.target.setAttribute("autocorrect",    "off");
+    GuacUI.Client.text_input.target.setAttribute("autocomplete",   "off");
+    GuacUI.Client.text_input.target.setAttribute("spellcheck",     "off");
 
     function keysym_from_codepoint(codepoint) {
 
@@ -2165,17 +2168,11 @@ GuacUI.Client.attach = function(guac) {
     }
 
     GuacUI.Client.text_input.target.onfocus = function() {
-
         GuacUI.Client.text_input.enabled = true;
-
-        // Reset content
-        reset_text_input_target(GuacUI.Client.TEXT_INPUT_PADDING);
-
     };
 
     GuacUI.Client.text_input.target.onblur = function() {
         GuacUI.Client.text_input.enabled = false;
-        GuacUI.Client.text_input.target.focus();
     };
 
     // Track state of composition
@@ -2219,6 +2216,7 @@ GuacUI.Client.attach = function(guac) {
 
         // Reset content
         reset_text_input_target(GuacUI.Client.TEXT_INPUT_PADDING);
+        e.preventDefault();
 
     }, false);
 
diff --git a/guacamole/src/main/webapp/styles/client.css b/guacamole/src/main/webapp/styles/client.css
index 722bd49a0..0ca11120d 100644
--- a/guacamole/src/main/webapp/styles/client.css
+++ b/guacamole/src/main/webapp/styles/client.css
@@ -719,6 +719,7 @@ p.hint {
     padding: 0.25em;
     padding-left: 0;
     background: #CDA;
+    overflow: hidden;
 
 }