diff --git a/core/constants.js b/core/constants.js index 13bc25ab..db11c251 100644 --- a/core/constants.js +++ b/core/constants.js @@ -194,7 +194,7 @@ const IconType = { }; const Regex = { - 'GOOGLE_FONTS': /fonts\.googleapis\.com\/(css|icons)(?!.*Material\+Icons).*/, + 'GOOGLE_FONTS': /fonts\.(googleapis|gstatic)\.com\/.*/, 'GOOGLE_MATERIAL_ICONS': /fonts\.googleapis\.com\/(icon|css)\?family=.*Material\+Icons/, 'JSDELIVR_COMBINE': /cdn\.jsdelivr\.net.*\/combine.*jquery.*hogan.*algoliasearch.*autocomplete.*/, 'BOOTSTRAP_DATEPICKER_3': /\/bootstrap-datepicker3.*\.css/, @@ -254,6 +254,7 @@ const CDNs = { const IgnoredHost = { 'fonts.googleapis.com': true, + 'fonts.gstatic.com': true, }; // Supported charsets for TextDecoder() diff --git a/core/interceptor.js b/core/interceptor.js index 8b394e97..69fc61f4 100644 --- a/core/interceptor.js +++ b/core/interceptor.js @@ -117,8 +117,8 @@ interceptor._handleStorageChanged = function (changes) { interceptor.blockGoogleFonts = changes.blockGoogleFonts.newValue; } - if (Setting.BLOCK_GOOGLE_FONTS in changes) { - interceptor.blockGoogleFonts = changes.blockGoogleFonts.newValue; + if (Setting.ALLOWED_DOMAINS_GOOGLE_FONTS in changes) { + interceptor.allowedDomainsGoogleFonts = changes.allowedDomainsGoogleFonts.newValue; } }; diff --git a/core/mappings.js b/core/mappings.js index a0e50235..88c7ebd0 100644 --- a/core/mappings.js +++ b/core/mappings.js @@ -29,7 +29,7 @@ var mappings = {}; * This only needs to be updated when new domains are added. * It's not necessary for subdirectories! */ -mappings.lastMappingUpdate = '2020-12-30'; +mappings.lastMappingUpdate = '2021-02-10'; mappings.cdn = { @@ -994,3 +994,6 @@ mappings.cdn['lib.baomitu.com'] = { // Boot CDN New [Mirror] mappings.cdn['cdn.bootcdn.net'] = mappings.cdn['cdnjs.cloudflare.com']; + +// CDN for the "Block Google Fonts" option (see: https://codeberg.org/nobody/LocalCDN/issues/269) +mappings.cdn['fonts.gstatic.com'] = mappings.cdn['fonts.googleapis.com']; diff --git a/pages/updates/updates.html b/pages/updates/updates.html index c4b3d1a9..36f60ba4 100644 --- a/pages/updates/updates.html +++ b/pages/updates/updates.html @@ -32,6 +32,7 @@
  • Updated: Google Material Icons v76 -> v77 (#267)
  • Updated: ember.js v3.24.1 -> v3.25.0 (#268)
  • Updated: instantsearch.js v4.13.2 -> v4.14.0 (#270)
  • +
  • Added CDN: fonts.gstatic.com (#269)