2 files changed, 10 insertions, 2 deletions

diff --git a/README.xwidget b/README.xwidget
index 0957c9136eb..2fdec89deb4 100644
--- a/README.xwidget
+++ b/README.xwidget
@@ -1495,3 +1495,7 @@ http://test
 hook so anything can filter browser history.
 ** TODO new relative url code sometimes fail
 http://www.dilbert.com
+** TODO input field enhancements
+- password field
+- textarea 
+
diff --git a/lisp/xwidget.el b/lisp/xwidget.el
index 71b3de5ff38..3f20914f88c 100644
--- a/lisp/xwidget.el
+++ b/lisp/xwidget.el
@@ -249,9 +249,13 @@ Argument STR string."
           (field-value
            (progn
              (xwidget-webkit-execute-script xww xwidget-webkit-activeelement-js)
-             (xwidget-webkit-execute-script-rv xww "findactiveelement(document).value;" ))))
+             (xwidget-webkit-execute-script-rv xww "findactiveelement(document).value;" )))
+          (field-type              (xwidget-webkit-execute-script-rv xww "findactiveelement(document).type;" )))
      (list xww
-           (read-string "string:" field-value))))
+           (cond ( (equal "text" field-type) (read-string "text:" field-value))
+                 ( (equal "password" field-type) (read-passwd "password:" nil field-value))
+                 ( (equal "textarea" field-type) (read-textarea "textarea:" field-value))
+                 ))))
   (xwidget-webkit-execute-script xw (format "findactiveelement(document).value='%s'" str)))