Merge branch 'master' of github.com:philc/vimium

2 files changed, 5 insertions, 4 deletions

diff --git a/settings.html b/settings.html
index f0cb87f5..92a6c886 100644
--- a/settings.html
+++ b/settings.html
@@ -23,10 +23,10 @@
   function restoreOptions() {
     // TODO(ilya): Create a single option list with defaults somewhere to share across various scripts. 
     var scrollStepSize = localStorage["scrollStepSize"] || 60;
-    var defaultZoomLvel = localStorage["defaultZoomLevel"] || 100;
+    var defaultZoomLevel = localStorage["defaultZoomLevel"] || 100;
 
     document.getElementById("scrollStepSize").value = scrollStepSize;
-    document.getElementById("defaultZoomLevel").value = defaultZoomLvel
+    document.getElementById("defaultZoomLevel").value = defaultZoomLevel
   }
   </script>
 
diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index 1e1aa845..735267e7 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -187,7 +187,8 @@ function onBlurCapturePhase(event) {
 }
 
 function isInputOrText(target) {
-  return ((target.tagName == "INPUT" && target.type == "text") || target.tagName == "TEXTAREA");
+  return ((target.tagName == "INPUT" && (target.type == "text" || target.type == "password")) ||
+          target.tagName == "TEXTAREA");
 }
 
 function enterInsertMode() {
@@ -241,4 +242,4 @@ var isIframe = (window.self != window.parent);
 if (!isIframe) {
   initializePreDomReady();
   window.addEventListener("DOMContentLoaded", initializeOnDomReady);
-}
\ No newline at end of file
+}