From 928c80e8a0ff1ff2d07f4747a33d4ed5e6aefae8 Mon Sep 17 00:00:00 2001
From: hallgren <hallgren@chalmers.se>
Date: Wed, 26 May 2010 15:49:08 +0000
Subject: [PATCH] Improved keyboard input handling in minibar/phrasebook

1. The text input field is shown form the start, no need to click.
2. The text input field is removed when no more words can be added to the
   sentence.
3. When you press Enter, a word is added to the sentence (1) if there is only
   one possible completion left (e.g. if you typed "airp" and the only
   completion is "airport"), or (2) if what you typed exactly matches one
   of the completions (e.g. if you typed "the" and the completions are
   "the", "theatre" and "these").
---
 src/runtime/javascript/minibar/minibar.js | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/runtime/javascript/minibar/minibar.js b/src/runtime/javascript/minibar/minibar.js
index 133f1aafa..356d7acc9 100644
--- a/src/runtime/javascript/minibar/minibar.js
+++ b/src/runtime/javascript/minibar/minibar.js
@@ -70,7 +70,7 @@ var server = {
 function start_minibar(opts) { // typically called when the HTML document is loaded
     if(opts) for(var o in opts) options[o]=opts[o];
     var surface=div_id("surface");
-    surface.setAttribute("onclick","surface_click(this)");
+    //surface.setAttribute("onclick","add_typed_input(this)");
     appendChildren(element("minibar"),
 		   [div_id("menubar"),
 		    surface,
@@ -187,7 +187,7 @@ function delete_last() {
   }
 }
 
-function surface_click(surface) {
+function add_typed_input(surface) {
     if(surface.typed)
 	inp=surface.typed;
     else {
@@ -201,6 +201,13 @@ function surface_click(surface) {
     inp.focus();
 }
 
+function remove_typed_input(surface) {
+    if(surface.typed) {
+	surface.typed.parentNode.removeChild(surface.typed);
+	surface.typed=null;
+    }
+}
+
 function complete_typed(inp) {
     var menu=element("language_menu");
     var c=menu.current;
@@ -211,9 +218,13 @@ function complete_typed(inp) {
 }
 
 function finish_typed(inp) {
+    //alert("finish_typed "+inp.value);
     var box=element("words");
+    var w=inp.value+" ";
     if(box.completions.length==1)
 	add_word(box.completions[0]);
+    else if(elem(w,box.completions))
+	add_word(w);
 }
 
 function generate_random() {
@@ -283,6 +294,11 @@ function show_completions(completions) {
   if(emptycnt>0)
     //setTimeout(function(){get_translations(menu);},200);
     get_translations(menu);
+  var surface=element("surface");
+  if(surface.typed && emptycnt==completions.length) {
+      if(surface.typed.value=="") remove_typed_input(surface);
+  }
+  else add_typed_input(surface);
 }
 
 function get_translations(menu) {