Merge branch 'issue-150'

5 files changed, 25 insertions, 8 deletions

diff --git a/js/background/inject/inject.js b/js/background/inject/inject.js
index 6adff2f..e3170d7 100644
--- a/js/background/inject/inject.js
+++ b/js/background/inject/inject.js
@@ -290,6 +290,10 @@ $j(document).ready(function () {
     function minedLoginSaved(args) {
         // If the login added by the user then this is true
         if (args.selfAdded) {
+            showDoorhanger({
+                data: args,
+                buttons: ['cancel']
+            });
             enterLoginDetails(args.credential, false);
         }
     }
diff --git a/js/background/service/background.js b/js/background/service/background.js
index 3e647c4..8b4cd10 100644
--- a/js/background/service/background.js
+++ b/js/background/service/background.js
@@ -540,9 +540,10 @@ var background = (function () {
         credential.label = args.label;
         credential.username = args.username;
         credential.password = args.password;
-        credential.vault_id = local_vault.vault_id;
+        credential.vault_id = account.vault_id;
         credential.url = sender.tab.url;
         PAPI.createCredential(account, credential, account.vault_password, function (createdCredential) {
+            credential.account = account;
             saveMinedCallback({credential: credential, updated: false, sender: sender, selfAdded: true});
             local_credentials.push(createdCredential);
 
diff --git a/js/lib/findForm.js b/js/lib/findForm.js
index 9c62721..5b5d40d 100644
--- a/js/lib/findForm.js
+++ b/js/lib/findForm.js
@@ -104,12 +104,17 @@ var formManager = function(){
             }
 
 
-
             // If we're not submitting a form (it's a page load), there are no
             // password field values for us to use for identifying fields. So,
             // just assume the first password field is the one to be filled in.
             if (!isSubmission || pwFields.length === 1){
-                return [usernameField, pwFields[0].element, null];
+                var res = [usernameField, pwFields[0].element];
+                if(pwFields[1]){
+                    res.push(pwFields[1].element);
+                } else {
+                    res.push(null);
+                }
+                return res;
             }
 
 
@@ -177,7 +182,14 @@ function getLoginFields(isSubmission) {
         if (passwordField === null){
             continue;
         }
-        loginForms.push([usernameField, passwordField]);
+
+        var res = [usernameField, passwordField];
+        if(result[2]){
+            res.push(result[2]);
+        } else {
+            res.push(null);
+        }
+        loginForms.push(res);
     }
     return loginForms;
 }
diff --git a/js/ui/doorhanger/doorhanger.js b/js/ui/doorhanger/doorhanger.js
index 6ac480a..505a7e6 100644
--- a/js/ui/doorhanger/doorhanger.js
+++ b/js/ui/doorhanger/doorhanger.js
@@ -78,12 +78,12 @@ $(document).ready(function () {
             data = data.data;
             var username = (data.username) ? data.username : data.email;
             var doorhanger_div = $('<div id="password-toolbar" style="display: none;">');
+            var text = data.selfAdded ? API.i18n.getMessage('credential_saved') : data.title + ' ' + username + ' at ' + data.url;
             $('<span>', {
                 class: 'toolbar-text',
-                text: data.title + ' ' + username + ' at ' + data.url
+                text: text
             }).appendTo(doorhanger_div);
 
-
             $.each(buttons, function (k, button) {
                 var btn = button;
 
diff --git a/js/ui/password_picker/password_picker.js b/js/ui/password_picker/password_picker.js
index aadca59..5bd9192 100644
--- a/js/ui/password_picker/password_picker.js
+++ b/js/ui/password_picker/password_picker.js
@@ -71,7 +71,7 @@ $(document).ready(function () {
 
         $('#savepw-save').click(function (e) {
             e.preventDefault();
-            $(this).text('Saving...');
+            $(this).text(API.i18n.getMessage("saving"));
             $(this).attr('disabled', true);
             API.runtime.sendMessage(API.runtime.id, {
                 method: "injectCreateCredential",
@@ -81,7 +81,7 @@ $(document).ready(function () {
                     password: pwfield.val(),
                     vaultIndex: vaultfield.val()
                 }
-            });
+            }).then(removePasswordPicker);
         });
 
         $('#savepw-cancel').click(function () {