Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into mouse-events

1 files changed, 10 insertions, 6 deletions

diff --git a/examples/data/scripts/formfiller.sh b/examples/data/scripts/formfiller.sh
index c1171a0..394bfbd 100755
--- a/examples/data/scripts/formfiller.sh
+++ b/examples/data/scripts/formfiller.sh
@@ -39,7 +39,10 @@ GenForm ()
 GetOption ()
 {
     DMENU_SCHEME=formfiller
-    DMENU_PROMPT="choose profile"
+
+    # util/dmenu.sh doesn't handle spaces in DMENU_PROMPT. a proper fix will be
+    # tricky.
+    DMENU_PROMPT="choose_profile"
     DMENU_LINES=4
 
     . "$UZBL_UTIL_DIR/dmenu.sh"
@@ -66,11 +69,7 @@ ParseFields ()
         field = $0
         sub ( /[^:]*:/, "", field )
 
-        if ( parts[2] ~ /^(text|password|search)$/ )
-            printf( "js uzbl.formfiller.insert(\"%s\",\"%s\",\"%s\",0);\n",
-                    parts[1], parts[2], field )
-
-        else if ( parts[2] ~ /^(checkbox|radio)$/ )
+        if ( parts[2] ~ /^(checkbox|radio)$/ )
             printf( "js uzbl.formfiller.insert(\"%s\",\"%s\",\"%s\",%s);\n",
                     parts[1], parts[2], parts[3], field )
 
@@ -87,6 +86,11 @@ ParseFields ()
                 parts[1], parts[2], field )
         }
 
+        else
+            printf( "js uzbl.formfiller.insert(\"%s\",\"%s\",\"%s\",0);\n",
+                    parts[1], parts[2], field )
+
+
     }'
 }