From 8e9fe020b543ddd5c16273c5bdafe1cfdbe0afa6 Mon Sep 17 00:00:00 2001
From: Raymond Hill <rhill@raymondhill.net>
Date: Sat, 21 Jul 2018 12:22:53 -0400
Subject: [PATCH] allow to view list content from blocked-document page

---
 src/document-blocked.html      | 132 +++------------------------------
 src/js/document-blocked.js     |  38 +++++-----
 src/js/reverselookup-worker.js |  18 ++---
 src/js/reverselookup.js        |   2 +-
 4 files changed, 36 insertions(+), 154 deletions(-)
diff --git a/src/document-blocked.html b/src/document-blocked.html
index 156ea6b15..a70493f0a 100644
--- a/src/document-blocked.html
+++ b/src/document-blocked.html
@@ -4,126 +4,7 @@
 <meta charset="utf-8">
 <title></title>
 <link rel="stylesheet" href="css/common.css" type="text/css">
-<style>
-body {
-    font-size: large;
-    text-align: center;
-    }
-body > div {
-    margin: 1.5em 0;
-    }
-body > div > p,
-body > div > div {
-    margin: 4px 0;
-    }
-body > div > p:first-child {
-    margin: 1.5em 0 0 0;
-    }
-a {
-    text-decoration: none;
-    }
-button {
-    cursor: pointer;
-    margin: 0 1em 0.25em 1em;
-    padding: 0.25em 0.5em;
-    font-size: inherit;
-    }
-select {
-    font: inherit;
-    padding: 2px;
-    }
-.code {
-    background-color: rgba(0, 0, 0, 0.1);
-    font-family: monospace;
-    font-size: large;
-    line-height: 1;
-    padding: 4px;
-    word-break: break-all;
-    }
-#warningSign {
-    opacity: 1;
-    pointer-events: none;
-    width: 100%;
-    }
-#warningSign > span {
-    color: #f2a500;
-    font-size: 10em;
-    }
-#theURL {
-    padding: 0;
-    }
-#theURL > * {
-    margin: 0;
-    }
-#theURL > p {
-    position: relative;
-    z-index: 10;
-    }
-#theURL > p > span {
-    background-color: transparent;
-    top: 100%;
-    box-sizing: border-box;
-    cursor: pointer;
-    opacity: 0.5;
-    padding: 0.2em;
-    position: absolute;
-    transform: translate(0, -50%);
-    }
-body[dir="ltr"] #theURL > p > span {
-    right: 0;
-    }
-body[dir="rtl"] #theURL > p > span {
-    left: 0;
-    }
-#theURL > p:hover > span {
-    opacity: 1;
-    }
-#theURL > p > span:before {
-    content: '\f010';
-    }
-#theURL.collapsed > p > span:before {
-    content: '\f00e';
-    }
-#parsed {
-    background-color: #f8f8f8;
-    border: 1px solid rgba(0, 0, 0, 0.1);
-    border-top: none;
-    color: gray;
-    font-size: small;
-    overflow-x: hidden;
-    padding: 4px;
-    text-align: initial;
-    text-overflow: ellipsis; 
-    }
-#theURL.collapsed > #parsed {
-    display: none;
-    }
-#parsed ul, #parsed li {
-    list-style-type: none;
-    }
-#parsed li {
-    white-space: nowrap;
-    }
-#parsed span {
-    display: inline-block;
-    }
-#parsed span:first-of-type {
-    font-weight: bold;
-    }
-#whyex {
-    font-size: smaller;
-    opacity: 0.6;
-    }
-#whyex:hover {
-    opacity: 1;
-    }
-#whyex a {
-    white-space: nowrap;
-}
-.proceedChoice {
-    text-align: left;
-    }
-</style>
+<link rel="stylesheet" type="text/css" href="css/document-blocked.css">
 </head>
 <body>
 <a href="https://github.com/gorhill/uBlock/wiki/Strict-blocking" target="_blank"><div id="warningSign"><span class="fa">&#xf071;</span></div></a>
@@ -152,8 +33,8 @@ body[dir="rtl"] #theURL > p > span {
     <button id="proceedPermanent" data-i18n="docblockedDisablePermanent" type="button"></button></p>
     </div>
 
-<div style="display: none;">
-    <span id="proceedTemplate">
+<div id="templates" style="display: none;">
+    <span class="proceed">
         <span></span>
         <span class="proceedChoice">
             <select>
@@ -164,7 +45,12 @@ body[dir="rtl"] #theURL > p > span {
         <span class="proceedChoice code hn"></span>
         <span></span>
     </span>
-    </div>
+    <span class="filterList">
+        <span class="filterListSeparator">&#x2022;</span>
+        <a class="filterListSource" href="" target="_blank"></a>&nbsp;<!--
+     --><a class="fa filterListSupport" href="" target="_blank">&#xf015;</a>
+    </span>
+</div>
 
 <script src="js/vapi.js"></script>
 <script src="js/vapi-common.js"></script>
diff --git a/src/js/document-blocked.js b/src/js/document-blocked.js
index 6657a027f..09a76e257 100644
--- a/src/js/document-blocked.js
+++ b/src/js/document-blocked.js
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
-    uBlock - a browser extension to block requests.
-    Copyright (C) 2015 Raymond Hill
+    uBlock Origin - a browser extension to block requests.
+    Copyright (C) 2015-present Raymond Hill
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -59,25 +59,21 @@ var details = {};
         if ( Array.isArray(lists) === false || lists.length === 0 ) {
             return;
         }
-        var parent = uDom.nodeFromSelector('#whyex > span:nth-of-type(2)');
-        var separator = '';
-        var entry, url, node;
-        for ( var i = 0; i < lists.length; i++ ) {
-            entry = lists[i];
-            if ( separator !== '' ) {
-                parent.appendChild(document.createTextNode(separator));
+        let parent = uDom.nodeFromSelector('#whyex > span:nth-of-type(2)');
+        for ( let i = 0; i < lists.length; i++ ) {
+            let entry = lists[i];
+            let elem = document.querySelector('#templates .filterList').cloneNode(true);
+            let source = elem.querySelector('.filterListSource');
+            source.href = 'asset-viewer.html?url=' + entry.assetKey;
+            source.textContent = entry.title;
+            if (
+                typeof entry.supportURL === 'string' &&
+                entry.supportURL !== ''
+            ) {
+                elem.querySelector('.filterListSupport')
+                    .setAttribute('href', entry.supportURL);
             }
-            url = entry.supportURL;
-            if ( typeof url === 'string' && url !== '' ) {
-                node = document.createElement('a');
-                node.textContent = entry.title;
-                node.setAttribute('href', url);
-                node.setAttribute('target', '_blank');
-            } else {
-                node = document.createTextNode(entry.title);
-            }
-            parent.appendChild(node);
-            separator = ' \u2022 ';
+            parent.appendChild(elem);
         }
         uDom.nodeFromId('whyex').style.removeProperty('display');
     };
@@ -146,7 +142,7 @@ var proceedPermanent = function() {
     if ( matches === null ) {
         return;
     }
-    var proceed = uDom('#proceedTemplate').clone();
+    var proceed = uDom('#templates .proceed').clone();
     proceed.descendants('span:nth-of-type(1)').text(matches[1]);
     proceed.descendants('span:nth-of-type(4)').text(matches[2]);
 
diff --git a/src/js/reverselookup-worker.js b/src/js/reverselookup-worker.js
index 3a9b96e27..5df97745f 100644
--- a/src/js/reverselookup-worker.js
+++ b/src/js/reverselookup-worker.js
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
     uBlock Origin - a browser extension to block requests.
-    Copyright (C) 2015-2017 Raymond Hill
+    Copyright (C) 2015-present Raymond Hill
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -51,21 +51,20 @@ var extractBlocks = function(content, begId, endId) {
 
 var fromNetFilter = function(details) {
     var lists = [],
-        compiledFilter = details.compiledFilter,
-        entry, content, pos, notFound;
+        compiledFilter = details.compiledFilter;
 
-    for ( var assetKey in listEntries ) {
-        entry = listEntries[assetKey];
+    for ( let assetKey in listEntries ) {
+        let entry = listEntries[assetKey];
         if ( entry === undefined ) { continue; }
-        content = extractBlocks(entry.content, 0, 1000);
-        pos = 0;
+        let content = extractBlocks(entry.content, 0, 1000);
+        let pos = 0;
         for (;;) {
             pos = content.indexOf(compiledFilter, pos);
             if ( pos === -1 ) { break; }
             // We need an exact match.
             // https://github.com/gorhill/uBlock/issues/1392
             // https://github.com/gorhill/uBlock/issues/835
-            notFound = pos !== 0 && content.charCodeAt(pos - 1) !== 0x0A;
+            let notFound = pos !== 0 && content.charCodeAt(pos - 1) !== 0x0A;
             pos += compiledFilter.length;
             if (
                 notFound ||
@@ -74,6 +73,7 @@ var fromNetFilter = function(details) {
                 continue;
             }
             lists.push({
+                assetKey: assetKey,
                 title: entry.title,
                 supportURL: entry.supportURL
             });
@@ -81,7 +81,7 @@ var fromNetFilter = function(details) {
         }
     }
 
-    var response = {};
+    let response = {};
     response[details.rawFilter] = lists;
 
     postMessage({
diff --git a/src/js/reverselookup.js b/src/js/reverselookup.js
index ebe73d56c..d407f853e 100644
--- a/src/js/reverselookup.js
+++ b/src/js/reverselookup.js
@@ -1,7 +1,7 @@
 /*******************************************************************************
 
     uBlock Origin - a browser extension to block requests.
-    Copyright (C) 2015-2017 Raymond Hill
+    Copyright (C) 2015-present Raymond Hill
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
