From 6bb319ce86df1bd2d46d09c2af77cfabaef972b3 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Wed, 20 Jun 2018 14:19:36 +0300 Subject: [PATCH] Rename Specified credential fields to Custom credential fields --- keepassxc-browser/keepassxc-browser.js | 16 +++---- keepassxc-browser/options/options.html | 22 ++++----- keepassxc-browser/options/options.js | 46 +++++++++---------- keepassxc-browser/popups/popup.html | 2 +- keepassxc-browser/popups/popup_httpauth.html | 2 +- keepassxc-browser/popups/popup_login.html | 2 +- .../popups/popup_multiple-fields.html | 2 +- 7 files changed, 46 insertions(+), 46 deletions(-) diff --git a/keepassxc-browser/keepassxc-browser.js b/keepassxc-browser/keepassxc-browser.js index f2354f4..22cf2fa 100755 --- a/keepassxc-browser/keepassxc-browser.js +++ b/keepassxc-browser/keepassxc-browser.js @@ -620,8 +620,8 @@ cipDefine.initDescription = function() { .addClass('btn').addClass('btn-primary') .css('margin-right', '15px') .click(function(e) { - if (!cip.settings['defined-credential-fields']) { - cip.settings['defined-credential-fields'] = {}; + if (!cip.settings['defined-custom-fields']) { + cip.settings['defined-custom-fields'] = {}; } if (cipDefine.selection.username) { @@ -639,7 +639,7 @@ cipDefine.initDescription = function() { } const location = cip.getDocumentLocation(); - cip.settings['defined-credential-fields'][location] = { + cip.settings['defined-custom-fields'][location] = { username: cipDefine.selection.username, password: cipDefine.selection.password, fields: fieldIds @@ -660,7 +660,7 @@ cipDefine.initDescription = function() { $description.append($btnDismiss); const location = cip.getDocumentLocation(); - if (cip.settings['defined-credential-fields'] && cip.settings['defined-credential-fields'][location]) { + if (cip.settings['defined-custom-fields'] && cip.settings['defined-custom-fields'][location]) { const $p = jQuery('

').html('For this page credential fields are already selected and will be overwritten.
'); const $btnDiscard = jQuery(' -

Remove specified credential fields?

+

Remove saved custom credential fields?

-

Do you really want to remove the specified credential fields on the page ?

-

KeePassXC-Browser will automatically detect the credential fields the next time you visit this page.

+

DDo you really want to remove the saved custom credential fields on the page: ?

+

KeePassXC-Browser will automatically detect the credential fields next time you visit this page.

diff --git a/keepassxc-browser/options/options.js b/keepassxc-browser/options/options.js index eec34da..7237f51 100644 --- a/keepassxc-browser/options/options.js +++ b/keepassxc-browser/options/options.js @@ -18,7 +18,7 @@ $(function() { options.initMenu(); options.initGeneralSettings(); options.initConnectedDatabases(); - options.initSpecifiedCredentialFields(); + options.initCustomCredentialFields(); options.initIgnoredSites(); options.initAbout(); }); @@ -214,50 +214,50 @@ options.initConnectedDatabases = function() { }); }; -options.initSpecifiedCredentialFields = function() { - $('#dialogDeleteSpecifiedCredentialFields').modal({keyboard: true, show: false, backdrop: true}); - $('#tab-specified-fields tr.clone:first button.delete:first').click(function(e) { +options.initCustomCredentialFields = function() { + $('#dialogDeleteCustomCredentialFields').modal({keyboard: true, show: false, backdrop: true}); + $('#tab-custom-fields tr.clone:first button.delete:first').click(function(e) { e.preventDefault(); - $('#dialogDeleteSpecifiedCredentialFields').data('url', $(this).closest('tr').data('url')); - $('#dialogDeleteSpecifiedCredentialFields').data('tr-id', $(this).closest('tr').attr('id')); - $('#dialogDeleteSpecifiedCredentialFields .modal-body:first strong:first').text($(this).closest('tr').children('td:first').text()); - $('#dialogDeleteSpecifiedCredentialFields').modal('show'); + $('#dialogDeleteCustomCredentialFields').data('url', $(this).closest('tr').data('url')); + $('#dialogDeleteCustomCredentialFields').data('tr-id', $(this).closest('tr').attr('id')); + $('#dialogDeleteCustomCredentialFields .modal-body:first strong:first').text($(this).closest('tr').children('td:first').text()); + $('#dialogDeleteCustomCredentialFields').modal('show'); }); - $('#dialogDeleteSpecifiedCredentialFields .modal-footer:first button.yes:first').click(function(e) { - $('#dialogDeleteSpecifiedCredentialFields').modal('hide'); + $('#dialogDeleteCustomCredentialFields .modal-footer:first button.yes:first').click(function(e) { + $('#dialogDeleteCustomCredentialFields').modal('hide'); - const url = $('#dialogDeleteSpecifiedCredentialFields').data('url'); - const trId = $('#dialogDeleteSpecifiedCredentialFields').data('tr-id'); - $('#tab-specified-fields #' + trId).remove(); + const url = $('#dialogDeleteCustomCredentialFields').data('url'); + const trId = $('#dialogDeleteCustomCredentialFields').data('tr-id'); + $('#tab-custom-fields #' + trId).remove(); - delete options.settings['defined-credential-fields'][url]; + delete options.settings['defined-custom-fields'][url]; options.saveSettings(); - if ($('#tab-specified-fields table tbody:first tr').length > 2) { - $('#tab-specified-fields table tbody:first tr.empty:first').hide(); + if ($('#tab-custom-fields table tbody:first tr').length > 2) { + $('#tab-custom-fields table tbody:first tr.empty:first').hide(); } else { - $('#tab-specified-fields table tbody:first tr.empty:first').show(); + $('#tab-custom-fields table tbody:first tr.empty:first').show(); } }); - const trClone = $('#tab-specified-fields table tr.clone:first').clone(true); + const trClone = $('#tab-custom-fields table tr.clone:first').clone(true); trClone.removeClass('clone'); let counter = 1; - for (let url in options.settings['defined-credential-fields']) { + for (let url in options.settings['defined-custom-fields']) { const tr = trClone.clone(true); tr.data('url', url); tr.attr('id', 'tr-scf' + counter); ++counter; tr.children('td:first').text(url); - $('#tab-specified-fields table tbody:first').append(tr); + $('#tab-custom-fields table tbody:first').append(tr); } - if ($('#tab-specified-fields table tbody:first tr').length > 2) { - $('#tab-specified-fields table tbody:first tr.empty:first').hide(); + if ($('#tab-custom-fields table tbody:first tr').length > 2) { + $('#tab-custom-fields table tbody:first tr.empty:first').hide(); } else { - $('#tab-specified-fields table tbody:first tr.empty:first').show(); + $('#tab-custom-fields table tbody:first tr.empty:first').show(); } }; diff --git a/keepassxc-browser/popups/popup.html b/keepassxc-browser/popups/popup.html index 83340d8..d049a0a 100644 --- a/keepassxc-browser/popups/popup.html +++ b/keepassxc-browser/popups/popup.html @@ -15,7 +15,7 @@
- +
diff --git a/keepassxc-browser/popups/popup_httpauth.html b/keepassxc-browser/popups/popup_httpauth.html index 8edb0ce..0adeec7 100644 --- a/keepassxc-browser/popups/popup_httpauth.html +++ b/keepassxc-browser/popups/popup_httpauth.html @@ -15,7 +15,7 @@
- +
diff --git a/keepassxc-browser/popups/popup_login.html b/keepassxc-browser/popups/popup_login.html index 09391e0..78f8d7c 100644 --- a/keepassxc-browser/popups/popup_login.html +++ b/keepassxc-browser/popups/popup_login.html @@ -15,7 +15,7 @@
- +
diff --git a/keepassxc-browser/popups/popup_multiple-fields.html b/keepassxc-browser/popups/popup_multiple-fields.html index a457820..6678540 100644 --- a/keepassxc-browser/popups/popup_multiple-fields.html +++ b/keepassxc-browser/popups/popup_multiple-fields.html @@ -14,7 +14,7 @@
- +