From 29b61f1f9e3f6508ba73054ba3863e60a1ccec34 Mon Sep 17 00:00:00 2001 From: varjolintu Date: Wed, 27 Nov 2019 21:35:05 +0200 Subject: [PATCH] Respect Site Preferences settings with the new Credential Banner --- keepassxc-browser/content/banner.js | 8 ++------ keepassxc-browser/content/keepassxc-browser.js | 5 +++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/keepassxc-browser/content/banner.js b/keepassxc-browser/content/banner.js index 3bbcc33..ab2cce6 100644 --- a/keepassxc-browser/content/banner.js +++ b/keepassxc-browser/content/banner.js @@ -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; diff --git a/keepassxc-browser/content/keepassxc-browser.js b/keepassxc-browser/content/keepassxc-browser.js index 2ad8389..e064e27 100755 --- a/keepassxc-browser/content/keepassxc-browser.js +++ b/keepassxc-browser/content/keepassxc-browser.js @@ -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; }