From a55438fba9b0335599e5d819ce6d5359fc276c00 Mon Sep 17 00:00:00 2001
From: Ian Adam Naval <ianonavy@gmail.com>
Date: Thu, 23 Oct 2014 16:17:19 -0400
Subject: [PATCH] Fix lastpass script for latest dwb

---
 dwb/dwb.configdir/userscripts/lastpass.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/dwb/dwb.configdir/userscripts/lastpass.js b/dwb/dwb.configdir/userscripts/lastpass.js
index 5f74f1f..d49f691 100644
--- a/dwb/dwb.configdir/userscripts/lastpass.js
+++ b/dwb/dwb.configdir/userscripts/lastpass.js
@@ -1,11 +1,10 @@
 //!javascript
 
 Signal.connect("documentLoaded", function(wv, frame) {
-    autofillForm();
+    autofillForm(frame.document);
 });
 
-function fillUsername(name, username) {
-    var doc = tabs.current.focusedFrame.document;
+function fillUsername(doc, name, username) {
     var box = doc.querySelector('input[name="' + name + '"]');
     if (!box) {
         box = doc.querySelector("input[name*=user]");
@@ -24,8 +23,7 @@ function fillUsername(name, username) {
     }
 }
 
-function fillPassword(name, password) {
-    var doc = tabs.current.focusedFrame.document;
+function fillPassword(doc, name, password) {
     var box = doc.querySelector('input[name="' + name + '"]');
     if (!box) {
         box = doc.querySelector("input[type=password]");
@@ -51,23 +49,23 @@ function lastPassFind(url, callbacks) {
     });
 }
 
-function autofillForm() {
+function autofillForm(doc) {
     var username, password;
     lastPassFind(tabs.current.uri, {
         onGetUsername: function (val) {
             username = val;
-            fillUsername("", val);
+            fillUsername(doc, "", val);
         },
         onGetPassword: function (val) { 
             password = val;
-            fillPassword("", val);
+            fillPassword(doc, "", val);
         },
         onGetFieldName: function (line, name) { 
             if (username && line.indexOf(username) > -1) {
-                fillUsername(name, username);
+                fillUsername(doc, name, username);
             }
             if (password && line.indexOf(password) > -1) {
-                fillPassword(name, password);
+                fillPassword(doc, name, password);
             }
         }
     });