prehistoric-systems/keepassxc-browser
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc-browser.git synced 2026-03-11 08:54:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop'

Browse source
This commit is contained in:
Janek Bevendorff 2018-03-04 23:38:43 +01:00
commit 3eccf42707
5 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG
View file

@ -1,3 +1,10 @@
1.0.1 (04-03-2018)
=========================
- Don't fill password fields if they already have data
- Fix custom placeholders
- Fix input type checks
- Fix custom input fields with multiple tabs
1.0.0 (27-02-2018)
=========================
- First stable release

2
keepassxc-browser/background/keepass.js
View file

@ -11,7 +11,7 @@ keepass.isDatabaseClosed = false;
keepass.isKeePassXCAvailable = false;
keepass.isEncryptionKeyUnrecognized = false;
keepass.currentKeePassXC = {'version': 0, 'versionParsed': 0};
keepass.requiredKeePassXC = 220;
keepass.requiredKeePassXC = 230;
keepass.nativeHostName = 'org.keepassxc.keepassxc_browser';
keepass.nativePort = null;
keepass.keySize = 24;

15
keepassxc-browser/keepassxc-browser.js
View file

@ -148,7 +148,7 @@ cipAutocomplete.onBlur = function() {
else {
const fieldId = cipFields.prepareId(jQuery(this).attr('data-cip-id'));
const fields = cipFields.getCombination('username', fieldId);
if (_f(fields.password) && _f(fields.password).data('unchanged') !== true && jQuery(this).val() !== '') {
if (_f(fields.password) && _f(fields.password).data('unchanged') !== true && jQuery(this).val() !== '' && _detectedFields > 1) {
cip.fillInCredentials(fields, true, true);
}
}
@ -1446,7 +1446,7 @@ cip.fillInFromActiveElement = function(suppressWarnings, passOnly = false) {
cipFields.setUniqueId(jQuery(el));
const fieldId = cipFields.prepareId(jQuery(el).attr('data-cip-id'));
let combination = null;
if ($(el).toType === 'password') {
if ($(el).attr('type') === 'password') {
combination = cipFields.getCombination('password', fieldId);
}
else {
@ -1504,15 +1504,16 @@ cip.setValue = function(field, value) {
}
};
cip.fillInStringFields = function(fields, StringFields, filledInFields) {
cip.fillInStringFields = function(fields, stringFields, filledInFields) {
let $filledIn = false;
filledInFields.list = [];
if (fields && StringFields && fields.length > 0 && StringFields.length > 0) {
if (fields && stringFields && fields.length > 0 && stringFields.length > 0) {
for (let i = 0; i < fields.length; i++) {
const $sf = _fs(fields[i]);
if ($sf && StringFields[i]) {
cip.setValue($sf, StringFields[i].Value);
const stringFieldValue = Object.values(stringFields[i]);
if ($sf && stringFieldValue[0]) {
cip.setValue($sf, stringFieldValue[0]);
filledInFields.list.push(fields[i]);
$filledIn = true;
}
@ -1695,7 +1696,7 @@ cip.contextMenuRememberCredentials = function() {
cipFields.setUniqueId(jQuery(el));
const fieldId = cipFields.prepareId(jQuery(el).attr('data-cip-id'));
let combination = null;
if ($(el).toType === 'password') {
if ($(el).attr('type') === 'password') {
combination = cipFields.getCombination('password', fieldId);
}
else {

6
keepassxc-browser/manifest.json
View file

@ -1,8 +1,8 @@
{
"manifest_version": 2,
"name": "KeePassXC-Browser",
"version": "1.0.0",
"version_name": "1.0.0",
"version": "1.0.1",
"version_name": "1.0.1",
"description": "KeePassXC integration for modern web browsers",
"author": "KeePassXC Team",
"icons": {
@ -104,7 +104,7 @@
"applications": {
"gecko": {
"id": "keepassxc-browser@keepassxc.org",
"strict_min_version": "55.0"
"strict_min_version": "52.0"
}
}
}

13
keepassxc-browser/popups/popup_functions.js
View file

@ -15,11 +15,16 @@ function initSettings() {
});
$('#settings #btn-choose-credential-fields').click(function() {
browser.runtime.getBackgroundPage().then((global) => {
browser.tabs.sendMessage(global.page.currentTabId, {
action: 'choose_credential_fields'
browser.windows.getCurrent().then((win) => {
browser.tabs.query({ 'active': true, 'currentWindow': true }).then((tabs) => {
const tab = tabs[0];
browser.runtime.getBackgroundPage().then((global) => {
browser.tabs.sendMessage(tab.id, {
action: 'choose_credential_fields'
});
close();
});
});
close();
});
});
}