From 3f325cea256c5fd082a1c029d27f63ab93440ba6 Mon Sep 17 00:00:00 2001 From: hackademix Date: Tue, 5 Mar 2019 00:58:13 +0100 Subject: Fixed inline whitelisting regressions (issue #35). --- bg/ListManager.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'bg') diff --git a/bg/ListManager.js b/bg/ListManager.js index e0a85e9..354866d 100644 --- a/bg/ListManager.js +++ b/bg/ListManager.js @@ -50,6 +50,14 @@ class ListManager { */ getStatus(key, defValue = "unknown") { let {blacklist, whitelist} = this.lists; + let inline = ListStore.viewSourceItem(key); + if (inline) { + return blacklist.contains(inline) + ? "blacklisted" + : whitelist.contains(inline) ? "whitelisted" + : defValue; + } + let match = key.match(/\(([^)]+)\)(?=[^()]*$)/); if (!match) { let url = ListStore.urlItem(key); @@ -61,7 +69,6 @@ class ListManager { } let [hashItem, srcHash] = match; // (hash), hash - return blacklist.contains(hashItem) ? "blacklisted" : this.builtInHashes.has(srcHash) || whitelist.contains(hashItem) ? "whitelisted" -- cgit v1.2.3