Fix context menu insert

3 files changed, 18 insertions, 14 deletions

diff --git a/src/js/Controller/Client/FillPassword.js b/src/js/Controller/Client/FillPassword.js
index 446d95f..4c2a488 100644
--- a/src/js/Controller/Client/FillPassword.js
+++ b/src/js/Controller/Client/FillPassword.js
@@ -56,7 +56,7 @@ export default class FillPassword extends AbstractController {
      */
       _fillCustomForms(formFields) {
         formFields.forEach((field) => {
-            var element = document.getElementById(field.id);
+            let element = document.getElementById(field.id);
             if(element !== null && element !== undefined) {
             if(!element.readOnly && !element.disabled && !element.hidden) {
                     this._insertTextIntoField(element, field.value);
diff --git a/src/js/Manager/AutofillManager.js b/src/js/Manager/AutofillManager.js
index 390638c..e4238d6 100644
--- a/src/js/Manager/AutofillManager.js
+++ b/src/js/Manager/AutofillManager.js
@@ -76,11 +76,11 @@ export default new class AutofillManager {
      *
      * @param {Password} password
      * @returns {Array}
-     * @private
      */
     getCustomFormFields(password) {
-        var formFields = [];
-        var customFields = password.getCustomFields();
+        let formFields = [],
+            customFields = password.getCustomFields();
+
         customFields._elements.forEach((e) => {
             if(e.getType() === 'data' && e.getLabel().startsWith('ext:field/')) {
                 formFields.push(
@@ -91,6 +91,7 @@ export default new class AutofillManager {
                 );
             }
         });
+
         return formFields;
     }
 };
diff --git a/src/js/Manager/ContextMenuManager.js b/src/js/Manager/ContextMenuManager.js
index 940c70e..0b6a7fb 100644
--- a/src/js/Manager/ContextMenuManager.js
+++ b/src/js/Manager/ContextMenuManager.js
@@ -1,12 +1,13 @@
-import SystemService from '@js/Services/SystemService';
+import SystemService         from '@js/Services/SystemService';
 import RecommendationManager from '@js/Manager/RecommendationManager';
-import LocalisationService from '@js/Services/LocalisationService';
-import { v4 as uuid } from 'uuid';
-import MessageService from '@js/Services/MessageService';
-import TabManager from '@js/Manager/TabManager';
-import ErrorManager from "@js/Manager/ErrorManager";
-import ThemeService from "@js/Services/ThemeService";
-import BlobToBase64Helper from "@js/Helper/BlobToBase64Helper";
+import LocalisationService   from '@js/Services/LocalisationService';
+import {v4 as uuid}          from 'uuid';
+import MessageService        from '@js/Services/MessageService';
+import TabManager            from '@js/Manager/TabManager';
+import ErrorManager          from '@js/Manager/ErrorManager';
+import ThemeService          from '@js/Services/ThemeService';
+import BlobToBase64Helper    from '@js/Helper/BlobToBase64Helper';
+import AutofillManager       from '@js/Manager/AutofillManager';
 
 class ContextMenuManager {
 
@@ -146,8 +147,10 @@ class ContextMenuManager {
                 channel : 'tabs',
                 tab     : TabManager.currentTabId,
                 payload : {
-                    user    : password.getUserName(),
-                    password: password.getPassword()
+                    user      : password.getUserName(),
+                    password  : password.getPassword(),
+                    formFields: AutofillManager.getCustomFormFields(password),
+                    submit    : false
                 }
             }
         );