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 #196 from keepassxreboot/ignore_sites_check

Browse source 
Add check function for site ignore settings
This commit is contained in:
Janek Bevendorff 2018-06-12 21:15:56 +02:00 committed by GitHub
commit f9abcb888e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1383,6 +1383,7 @@ cip.initCredentialFields = function(forceCall) {
_called.clearLogins = true; _called.clearLogins = true;
// Ignore sites with full ignore // Ignore sites with full ignore
cip.initializeIgnoredSites();
if (cip.settings.ignoredSites) { if (cip.settings.ignoredSites) {
for (const site of cip.settings.ignoredSites) { for (const site of cip.settings.ignoredSites) {
if (site.fullIgnore && siteMatch(site.url, document.location.href)) { if (site.fullIgnore && siteMatch(site.url, document.location.href)) {
@ -2006,16 +2007,9 @@ cip.ignoreSite = function(sites) {
return; return;
} }
// Delete previously created Object if it exists. It will be replaced by an Array cip.initializeIgnoredSites();
if (cip.settings['ignoredSites'] !== null && cip.settings['ignoredSites'].constructor === Object) {
delete cip.settings['ignoredSites'];
}
const site = sites[0]; const site = sites[0];
if (!cip.settings['ignoredSites']) {
cip.settings['ignoredSites'] = [];
}
cip.settings['ignoredSites'].push({ cip.settings['ignoredSites'].push({
url: site, url: site,
fullIgnore: false fullIgnore: false
@ -2027,6 +2021,16 @@ cip.ignoreSite = function(sites) {
}); });
}; };
// Delete previously created Object if it exists. It will be replaced by an Array
cip.initializeIgnoredSites = function() {
if (cip.settings['ignoredSites'] !== null && cip.settings['ignoredSites'].constructor === Object) {
delete cip.settings['ignoredSites'];
}
if (!cip.settings['ignoredSites']) {
cip.settings['ignoredSites'] = [];
}
};
cip.getDocumentLocation = function() { cip.getDocumentLocation = function() {
return cip.settings.saveDomainOnly ? document.location.origin : document.location.href; return cip.settings.saveDomainOnly ? document.location.origin : document.location.href;