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 #1981 from keepassxreboot/fix/notification_removal

Browse source 
Fix removing notifications
This commit is contained in:
Sami Vänttinen 2023-09-07 14:47:33 +03:00 committed by GitHub
commit f3379e6677
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
keepassxc-browser/content/ui.js
View file

@ -251,6 +251,29 @@ kpxcUI.createNotification = function(type, message) {
return;
}
// Removes notification from the body element
const removeNotification = function() {
// Catch cross-domain exception
let parentBody;
try {
parentBody = window.parent.document.body;
} catch(e) {
parentBody = window.document.body;
}
if (notificationWrapper && parentBody.contains(notificationWrapper)) {
parentBody.removeChild(notificationWrapper);
notificationWrapper = undefined;
return;
}
// Notification is not in the parent
if (notificationWrapper && parentBody !== window.document.body && window.document.body.contains(notificationWrapper)) {
window.document.body.removeChild(notificationWrapper);
notificationWrapper = undefined;
}
};
logDebug(message);
const notification = kpxcUI.createElement('div', 'kpxc-notification kpxc-notification-' + type, {});
@ -262,10 +285,7 @@ kpxcUI.createNotification = function(type, message) {
const msg = kpxcUI.createElement('span', '', {}, message);
notification.addEventListener('click', function() {
if (notificationWrapper && window.parent.document.body.contains(notificationWrapper)) {
window.parent.document.body.removeChild(notificationWrapper);
notificationWrapper = undefined;
}
removeNotification();
});
notification.appendMultiple(icon, label, msg);
@ -289,10 +309,7 @@ kpxcUI.createNotification = function(type, message) {
// Destroy the banner after five seconds
notificationTimeout = setTimeout(() => {
if (notificationWrapper && window.parent.document.body.contains(notificationWrapper)) {
window.parent.document.body.removeChild(notificationWrapper);
notificationWrapper = undefined;
}
removeNotification();
}, 5000);
};