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 #694 from keepassxreboot/fix/banner_with_site_preferences

Browse source 
Respect Site Preferences settings with the banner
This commit is contained in:
Sami Vänttinen 2019-12-09 15:30:02 +02:00 committed by GitHub
commit 6df0c5452e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -44,12 +44,8 @@ kpxcBanner.create = async function(credentials = {}) {
}
// Don't show anything if the site is in the ignore
if (kpxc.settings.sitePreferences !== undefined) {
for (const site of kpxc.settings.sitePreferences) {
if (site.ignore !== IGNORE_NOTHING && (site.url === credentials.url || siteMatch(site.url, credentials.url))) {
return;
}
}
if (kpxc.siteIgnored(IGNORE_NORMAL)) {
return;
}
kpxcBanner.created = true;

5
keepassxc-browser/content/keepassxc-browser.js
View file

@ -885,7 +885,7 @@ kpxc.detectDatabaseChange = async function(response) {
};
// Checks if the site has been ignored using Site Preferences
kpxc.siteIgnored = function() {
kpxc.siteIgnored = function(condition) {
kpxc.initializeSitePreferences();
if (kpxc.settings.sitePreferences) {
let currentLocation;
@ -897,9 +897,10 @@ kpxc.siteIgnored = function() {
currentLocation = window.self.location.href;
}
const currentSetting = condition || IGNORE_FULL;
for (const site of kpxc.settings.sitePreferences) {
if (siteMatch(site.url, currentLocation) || site.url === currentLocation) {
if (site.ignore === IGNORE_FULL) {
if (site.ignore === currentSetting) {
return true;
}