filippodb/LocalCDN-Firefox-Chrome-Brave
1
0
Fork 0
mirror of https://codeberg.org/nobody/LocalCDN.git synced 2025-06-05 21:49:31 +02:00
Code Issues Projects Releases Wiki Activity

Updated: Handling of Google Fonts (#85)

Browse Source
This commit is contained in:
nobody
2020-08-22 14:58:57 +02:00
parent db083a9f2f
commit 8e244f3a26
8 changed files with 143 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/interceptor.js
View File

@@ -35,22 +35,22 @@ interceptor.handleRequest = function (requestDetails, tabIdentifier, tab) {
if (!validCandidate) {
return {
cancel: false,
'cancel': false
};
}
// Possible URLs of Google Fonts: https://fonts.googleapis.com/css
// https://fonts.googleapis.com/css2
if (requestDetails.url.startsWith('https://fonts.googleapis.com/css')) {
if (interceptor.blockGoogleFonts === true || interceptor.blockMissing === true) {
targetDetails = requestAnalyzer.getLocalTarget(requestDetails);
targetPath = targetDetails.path;
if (requestDetails.url.includes('fonts.googleapis.com') && !requestDetails.url.includes('Material+Icons')) {
let initiatorDomain = helpers.extractDomainFromUrl(tab.url, true);
// Check if the website is allowed to load Google Fonts
if (interceptor.blockGoogleFonts === true && !requestAnalyzer.domainsGoogleFonts[initiatorDomain]) {
return {
'cancel': true
};
}
}
targetDetails = requestAnalyzer.getLocalTarget(requestDetails);
targetPath = targetDetails.path;
if (!targetDetails) {
return interceptor._handleMissingCandidate(requestDetails.url);
}
@@ -111,6 +111,10 @@ interceptor._handleStorageChanged = function (changes) {
if (Setting.BLOCK_GOOGLE_FONTS in changes) {
interceptor.blockGoogleFonts = changes.blockGoogleFonts.newValue;
}
if (Setting.BLOCK_GOOGLE_FONTS in changes) {
interceptor.blockGoogleFonts = changes.blockGoogleFonts.newValue;
}
};
/**
@@ -121,18 +125,21 @@ interceptor.amountInjected = 0;
interceptor.xhrTestDomain = Address.LOCALCDN;
interceptor.blockMissing = false;
interceptor.blockGoogleFonts = true;
interceptor.allowedDomainsGoogleFonts = {};
interceptor.relatedSettings = [];
interceptor.relatedSettings.push(Setting.AMOUNT_INJECTED);
interceptor.relatedSettings.push(Setting.XHR_TEST_DOMAIN);
interceptor.relatedSettings.push(Setting.BLOCK_MISSING);
interceptor.relatedSettings.push(Setting.ALLOWED_DOMAINS_GOOGLE_FONTS);
chrome.storage.sync.get(interceptor.relatedSettings, function (items) {
interceptor.amountInjected = items.amountInjected || 0;
interceptor.xhrTestDomain = items.xhrTestDomain || Address.LOCALCDN;
interceptor.blockMissing = items.blockMissing || false;
interceptor.blockGoogleFonts = items.blockGoogleFonts || true;
interceptor.allowedDomainsGoogleFonts = items.allowedDomainsGoogleFonts || {};
});
/**