From 7629412165595310becd86d1a9cb502efe81ba85 Mon Sep 17 00:00:00 2001 From: nobody Date: Thu, 30 Jun 2022 05:06:15 +0200 Subject: [PATCH] Badge color for missing resources (#1031) --- core/interceptor.js | 12 ++++++------ pages/updates/updates.html | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/core/interceptor.js b/core/interceptor.js index 6d1e2fb4..cca3738e 100644 --- a/core/interceptor.js +++ b/core/interceptor.js @@ -33,6 +33,11 @@ var interceptor = {}; interceptor.handleRequest = function (requestDetails, tabIdentifier, tab) { let validCandidate, targetDetails, targetDomain, isGoogleFont, isGoogleMaterialIcons, initiatorDomain, isListed; + targetDetails = requestAnalyzer.getLocalTarget(requestDetails, tab.url); + stateManager.requests[requestDetails.requestId] = { + tabIdentifier, targetDetails + }; + validCandidate = requestAnalyzer.isValidCandidate(requestDetails, tab); if (!validCandidate) { return { @@ -74,8 +79,6 @@ interceptor.handleRequest = function (requestDetails, tabIdentifier, tab) { }; } - targetDetails = requestAnalyzer.getLocalTarget(requestDetails, tab.url); - if (targetDetails['result'] === false) { if (!IgnoredHost[targetDomain]) { ++stateManager.tabs[tabIdentifier].missing; @@ -83,10 +86,6 @@ interceptor.handleRequest = function (requestDetails, tabIdentifier, tab) { return interceptor._handleMissingCandidate(requestDetails.url, tabIdentifier); } - stateManager.requests[requestDetails.requestId] = { - tabIdentifier, targetDetails - }; - return { 'redirectUrl': chrome.runtime.getURL(targetDetails.path + fileGuard.secret) }; @@ -106,6 +105,7 @@ interceptor._handleMissingCandidate = function (requestUrl, tabIdentifier) { missingCount = stateManager.tabs[tabIdentifier].missing || 0; if (missingCount > 0 && injectionCount === 0) { wrappers.setBadgeText(tabIdentifier, injectionCount); + wrappers.setBadgeColoring(tabIdentifier, BadgeSettingMissingResource.TYPE); } } else { wrappers.setBadgeText(tabIdentifier, injectionCount); diff --git a/pages/updates/updates.html b/pages/updates/updates.html index e0788c20..2b3ee7c9 100644 --- a/pages/updates/updates.html +++ b/pages/updates/updates.html @@ -65,6 +65,10 @@
  • twix.js v0.3.0 v1.3.0 (#1029)
  • moment.js v2.5.1 (#1029)
  • +

    Fixed

    +