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 pull request #2069 from keepassxreboot/fix/rename_banner_container_id

Browse source 
Rename Credential Banner container id
This commit is contained in:
Sami Vänttinen 2024-01-06 14:51:06 +02:00 committed by GitHub
commit 364c7fe416
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 72 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
keepassxc-browser/content/banner.js
View file

@ -47,7 +47,7 @@ kpxcBanner.create = async function(credentials = {}) {
credentials.username = credentials.username.trim();
kpxcBanner.credentials = credentials;
const banner = kpxcUI.createElement('div', 'kpxc-banner', { 'id': 'container' });
const banner = kpxcUI.createElement('div', 'kpxc-banner', { 'id': 'kpxc-banner-container' });
initColorTheme(banner);
banner.style.zIndex = '2147483646';
@ -61,13 +61,32 @@ kpxcBanner.create = async function(credentials = {}) {
const usernameText = kpxcUI.createElement('span', 'small', {}, tr('popupUsername') + ' ');
const usernameSpan = kpxcUI.createElement('span', 'small info information-username', {}, credentials.username);
const newButton = kpxcUI.createElement('button', GREEN_BUTTON, { 'id': 'kpxc-banner-btn-new' }, tr('popupButtonNew'));
const updateButton = kpxcUI.createElement('button', ORANGE_BUTTON, { 'id': 'kpxc-banner-btn-update' }, tr('popupButtonUpdate'));
const dismissButton = kpxcUI.createElement('button', RED_BUTTON, { 'id': 'kpxc-banner-btn-dismiss' }, tr('popupButtonDismiss'));
const newButton = kpxcUI.createElement('button', GREEN_BUTTON, { id: 'kpxc-banner-btn-new' }, tr('popupButtonNew'));
const updateButton = kpxcUI.createElement(
'button',
ORANGE_BUTTON,
{ id: 'kpxc-banner-btn-update' },
tr('popupButtonUpdate'),
);
const dismissButton = kpxcUI.createElement(
'button',
RED_BUTTON,
{ id: 'kpxc-banner-btn-dismiss' },
tr('popupButtonDismiss'),
);
const separator = kpxcUI.createElement('div', 'kpxc-separator');
const ignoreCheckbox = kpxcUI.createElement('input', 'kpxc-checkbox', { type: 'checkbox', name: 'ignoreCheckbox', id: 'kpxc-banner-ignoreCheckbox' });
const checkboxLabel = kpxcUI.createElement('label', 'kpxc-checkbox-label', { for: 'kpxc-banner-ignoreCheckbox' }, tr('popupButtonIgnore'));
const ignoreCheckbox = kpxcUI.createElement('input', 'kpxc-checkbox', {
type: 'checkbox',
name: 'ignoreCheckbox',
id: 'kpxc-banner-ignoreCheckbox',
});
const checkboxLabel = kpxcUI.createElement(
'label',
'kpxc-checkbox-label',
{ for: 'kpxc-banner-ignoreCheckbox' },
tr('popupButtonIgnore'),
);
// No existing credentials to update --> disable Update button
if (credentials.list.length === 0) {
@ -171,7 +190,13 @@ kpxcBanner.saveNewCredentials = async function(credentials = {}) {
// Create a new group
const newGroup = await sendMessage('create_new_group', [ result.defaultGroup ]);
if (newGroup.name && newGroup.uuid) {
const res = await sendMessage('add_credentials', [ credentials.username, credentials.password, credentials.url, newGroup.name, newGroup.uuid ]);
const res = await sendMessage('add_credentials', [
credentials.username,
credentials.password,
credentials.url,
newGroup.name,
newGroup.uuid,
]);
kpxcBanner.verifyResult(res);
} else {
kpxcUI.createNotification('error', tr('rememberErrorCreatingNewGroup'));
@ -181,7 +206,13 @@ kpxcBanner.saveNewCredentials = async function(credentials = {}) {
}
}
const res = await sendMessage('add_credentials', [ credentials.username, credentials.password, credentials.url, gname, guuid ]);
const res = await sendMessage('add_credentials', [
credentials.username,
credentials.password,
credentials.url,
gname,
guuid,
]);
kpxcBanner.verifyResult(res);
return;
}
@ -213,7 +244,13 @@ kpxcBanner.saveNewCredentials = async function(credentials = {}) {
return;
}
const res = await sendMessage('add_credentials', [ credentials.username, credentials.password, credentials.url, group, groupUuid ]);
const res = await sendMessage('add_credentials', [
credentials.username,
credentials.password,
credentials.url,
group,
groupUuid,
]);
kpxcBanner.verifyResult(res);
});
@ -243,7 +280,12 @@ kpxcBanner.updateCredentials = async function(credentials = {}) {
// Use the current username if it's empty
credentials.username ??= credentials.list[0].login;
const res = await sendMessage('update_credentials', [ credentials.list[0].uuid, credentials.username, credentials.password, credentials.url ]);
const res = await sendMessage('update_credentials', [
credentials.list[0].uuid,
credentials.username,
credentials.password,
credentials.url,
]);
kpxcBanner.verifyResult(res);
} else {
await kpxcBanner.createCredentialDialog();
@ -259,7 +301,12 @@ kpxcBanner.updateCredentials = async function(credentials = {}) {
}
for (const [ i, cred ] of credentials.list.entries()) {
const a = kpxcUI.createElement('a', 'list-group-item', { 'href': '#', 'entryId': i }, `${cred.login} (${cred.name})`);
const a = kpxcUI.createElement(
'a',
'list-group-item',
{ href: '#', entryId: i },
`${cred.login} (${cred.name})`,
);
a.addEventListener('click', function(e) {
e.preventDefault();
if (!e.isTrusted) {
@ -286,7 +333,12 @@ kpxcBanner.updateCredentials = async function(credentials = {}) {
return;
}
const res = await sendMessage('update_credentials', [ credentials.list[entryId].uuid, credentials.username, credentials.password, credentials.url ]);
const res = await sendMessage('update_credentials', [
credentials.list[entryId].uuid,
credentials.username,
credentials.password,
credentials.url,
]);
kpxcBanner.verifyResult(res);
});
});
@ -306,10 +358,16 @@ kpxcBanner.verifyResult = async function(code) {
if (code === 'error') {
kpxcUI.createNotification('error', tr('rememberErrorCannotSaveCredentials'));
} else if (code === 'created') {
kpxcUI.createNotification('success', tr('rememberCredentialsSaved', kpxcBanner.credentials.username || tr('rememberEmptyUsername')));
kpxcUI.createNotification(
'success',
tr('rememberCredentialsSaved', kpxcBanner.credentials.username || tr('rememberEmptyUsername')),
);
await kpxc.retrieveCredentials(true); // Forced reload
} else if (code === 'updated') {
kpxcUI.createNotification('success', tr('rememberCredentialsUpdated', kpxcBanner.credentials.username || tr('rememberEmptyUsername')));
kpxcUI.createNotification(
'success',
tr('rememberCredentialsUpdated', kpxcBanner.credentials.username || tr('rememberEmptyUsername')),
);
await kpxc.retrieveCredentials(true); // Forced reload
} else if (code === 'canceled') {
kpxcUI.createNotification('warning', tr('rememberCredentialsNotSaved'));