diff options
author | Ruben Rodriguez <ruben@gnu.org> | 2018-10-03 22:23:39 +0000 |
---|---|---|
committer | Ruben Rodriguez <ruben@gnu.org> | 2018-10-03 22:23:39 +0000 |
commit | 5461a48cbeac01d5f8bc31a10d11ff72a295c7d9 (patch) | |
tree | 3a6b571ac604ed2208f2a9b492de669e59d2f48f /main_background.js | |
parent | f881f1dbcd8c76685256f3701f25f916abda3e30 (diff) | |
parent | eae399dfd0ade951e9bc87897247bcffffee614f (diff) |
Merge #24 `Lenient WebLabels matching (by URL, by id, by name).`
Diffstat (limited to 'main_background.js')
-rw-r--r-- | main_background.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main_background.js b/main_background.js index 4cfca7a..cdc987e 100644 --- a/main_background.js +++ b/main_background.js @@ -859,6 +859,7 @@ var ResponseHandler = { let {request} = response; let {url, type, tabId, frameId, documentUrl} = request; + let fullUrl = url; url = ListStore.urlItem(url); let site = ListStore.siteItem(url); @@ -888,11 +889,11 @@ var ResponseHandler = { "whitelisted": [url, whitelistedSite ? `User whitelisted ${site}` : "Whitelisted by user"]}); return ResponseProcessor.ACCEPT; } else { - let scriptInfo = await ExternalLicenses.check({url, tabId, frameId, documentUrl}); + let scriptInfo = await ExternalLicenses.check({url: fullUrl, tabId, frameId, documentUrl}); if (scriptInfo) { let verdict, ret; let msg = scriptInfo.toString(); - if (scriptInfo.allFree) { + if (scriptInfo.free) { verdict = "accepted"; ret = ResponseProcessor.ACCEPT; } else { |