toward 0.1.4.0

_locales/en/messages.json

@@ -113,19 +113,35 @@
         "message": "You can inspect the details of blocked requests if you wish by enabling this option. The logging of blocked requests increases the memory footprint of µBlock. Since many users will never use this feature, it is disabled by default.",
         "description": "English: see _locales/en/messages.log"
     },
-    "logBlockedRequestsHeaderType" : {
+    "logAllowedRequestsPrompt" : {
+        "message": "Enable the logging of non-blocked requests",
+        "description": "English: Enable the logging of non-blocked requests"
+    },
+    "logAllowedRequestsHelp" : {
+        "message": "You can inspect the details of non-blocked requests if you wish by enabling this option. The logging of non-blocked requests increases the memory footprint of µBlock. Since many users will never use this feature, it is disabled by default.",
+        "description": "English: see _locales/en/messages.log"
+    },
+    "logBlockedRequestsHeader" : {
+        "message": "Blocked requests",
+        "description": "English: Blocked requests"
+    },
+    "logAllowedRequestsHeader" : {
+        "message": "Allowed requests",
+        "description": "English: Allowed requests"
+    },
+    "logRequestsHeaderType" : {
         "message": "Type",
         "description": "English: Type"
     },
-    "logBlockedRequestsHeaderDomain" : {
+    "logRequestsHeaderDomain" : {
         "message": "Domain",
         "description": "English: Domain"
     },
-    "logBlockedRequestsHeaderURL" : {
+    "logRequestsHeaderURL" : {
-        "message": "Blocked URL",
+        "message": "URL",
-        "description": "English: Blocked URL"
+        "description": "English: URL"
     },
-    "logBlockedRequestsHeaderFilter" : {
+    "logRequestsHeaderFilter" : {
         "message": "Filter",
         "description": "English: Filter"
     },
@@ -133,6 +149,10 @@
         "message": "No blocked requests logged for this page",
         "description": "English: No blocked requests logged for this page"
     },
+    "logAllowedRequestsEmpty" : {
+        "message": "No non-blocked requests logged for this page",
+        "description": "English: No non-blocked requests logged for this page"
+    },
 
 
     "aboutChangelog" : {

_locales/fr/messages.json

@@ -113,19 +113,35 @@
         "message": "Vous pouvez inspecter les détails des requêtes bloquées en activant cette option. La journalisation des requêtes bloquées augmente l'empreinte mémoire utilisée par µBlock. Puisque que bon nombre d'utilisateurs n'utiliseront jamais cette fonctionnalité, elle est désactivée par défaut.",
         "description": "English: see _locales/en/messages.log"
     },
-    "logBlockedRequestsHeaderType" : {
+    "logAllowedRequestsPrompt" : {
+        "message": "Activer la journalisation des requêtes permises",
+        "description": "English: Enable the logging of non-blocked requests"
+    },
+    "logAllowedRequestsHelp" : {
+        "message": "Vous pouvez inspecter les détails des requêtes permises en activant cette option. La journalisation des requêtes permises augmente l'empreinte mémoire utilisée par µBlock. Puisque que bon nombre d'utilisateurs n'utiliseront jamais cette fonctionnalité, elle est désactivée par défaut.",
+        "description": "English: see _locales/en/messages.log"
+    },
+    "logBlockedRequestsHeader" : {
+        "message": "Requêtes bloquées",
+        "description": "English: Blocked requests"
+    },
+    "logAllowedRequestsHeader" : {
+        "message": "Requêtes permises",
+        "description": "English: Allowed requests"
+    },
+    "logRequestsHeaderType" : {
         "message": "Type",
         "description": "English: Type"
     },
-    "logBlockedRequestsHeaderDomain" : {
+    "logRequestsHeaderDomain" : {
         "message": "Domaine",
-        "description": "English: Domaine"
+        "description": "English: Domain"
     },
-    "logBlockedRequestsHeaderURL" : {
+    "logRequestsHeaderURL" : {
-        "message": "URL bloquée",
+        "message": "URL",
-        "description": "English: Blocked URL"
+        "description": "English: URL"
     },
-    "logBlockedRequestsHeaderFilter" : {
+    "logRequestsHeaderFilter" : {
         "message": "Filtre",
         "description": "English: Filter"
     },
@@ -133,6 +149,10 @@
         "message": "Il n'y a aucune requête bloquée dans le journal",
         "description": "English: No blocked requests logged for this page"
     },
+    "logAllowedRequestsEmpty" : {
+        "message": "Il n'y a aucune requête non-bloquée dans le journal",
+        "description": "English: No non-blocked requests logged for this page"
+    },
 
 
     "aboutChangelog" : {

_locales/it/messages.json

@@ -113,26 +113,46 @@
         "message": "Puoi controllare i dettagli delle richieste bloccate se abiliti questa opzione. La registrazione delle richieste bloccate aumenta l'uso della memoria da parte di µBlock. Di default è disabilitata, poiché la maggior parte degli utenti non ha bisogno di questa funzione.",
         "description": "English: see _locales/en/messages.log"
     },
-    "logBlockedRequestsHeaderType" : {
+    "logAllowedRequestsPrompt" : {
+        "message": "Enable the logging of non-blocked requests",
+        "description": "English: Enable the logging of non-blocked requests"
+    },
+    "logAllowedRequestsHelp" : {
+        "message": "You can inspect the details of non-blocked requests if you wish by enabling this option. The logging of non-blocked requests increases the memory footprint of µBlock. Since many users will never use this feature, it is disabled by default.",
+        "description": "English: see _locales/en/messages.log"
+    },
+    "logBlockedRequestsHeader" : {
+        "message": "Richieste bloccate",
+        "description": "English: Blocked requests"
+    },
+    "logAllowedRequestsHeader" : {
+        "message": "Allowed requests",
+        "description": "English: Allowed requests"
+    },
+    "logRequestsHeaderType" : {
         "message": "Tipo",
         "description": "English: Type"
     },
-    "logBlockedRequestsHeaderDomain" : {
+    "logRequestsHeaderDomain" : {
         "message": "Dominio",
         "description": "English: Domain"
     },
-    "logBlockedRequestsHeaderURL" : {
+    "logRequestsHeaderURL" : {
-        "message": "Indirizzo bloccato",
+        "message": "Indirizzo",
-        "description": "English: Blocked URL"
+        "description": "English: URL"
     },
-    "logBlockedRequestsHeaderFilter" : {
+    "logRequestsHeaderFilter" : {
         "message": "Filtro",
         "description": "English: Filter"
     },
     "logBlockedRequestsEmpty" : {
-        "message": "Nel registro, non ci sono richieste bloccate per questa pagina.",
+        "message": "Nel registro, non ci sono richieste bloccate per questa pagina",
         "description": "English: No blocked requests logged for this page"
     },
+    "logAllowedRequestsEmpty" : {
+        "message": "No non-blocked requests logged for this page",
+        "description": "English: No non-blocked requests logged for this page"
+    },
 
 
     "aboutChangelog" : {

_locales/ru/messages.json

@@ -113,19 +113,35 @@
         "message": "You can inspect the details of blocked requests if you wish by enabling this option. The logging of blocked requests increases the memory footprint of µBlock. Since many users will never use this feature, it is disabled by default.",
         "description": "English: see _locales/en/messages.log"
     },
-    "logBlockedRequestsHeaderType" : {
+    "logAllowedRequestsPrompt" : {
+        "message": "Enable the logging of non-blocked requests",
+        "description": "English: Enable the logging of non-blocked requests"
+    },
+    "logAllowedRequestsHelp" : {
+        "message": "You can inspect the details of non-blocked requests if you wish by enabling this option. The logging of non-blocked requests increases the memory footprint of µBlock. Since many users will never use this feature, it is disabled by default.",
+        "description": "English: see _locales/en/messages.log"
+    },
+    "logBlockedRequestsHeader" : {
+        "message": "Blocked requests",
+        "description": "English: Blocked requests"
+    },
+    "logAllowedRequestsHeader" : {
+        "message": "Allowed requests",
+        "description": "English: Allowed requests"
+    },
+    "logRequestsHeaderType" : {
         "message": "Type",
         "description": "English: Type"
     },
-    "logBlockedRequestsHeaderDomain" : {
+    "logRequestsHeaderDomain" : {
         "message": "Domain",
         "description": "English: Domain"
     },
-    "logBlockedRequestsHeaderURL" : {
+    "logRequestsHeaderURL" : {
-        "message": "Blocked URL",
+        "message": "URL",
-        "description": "English: Blocked URL"
+        "description": "English: URL"
     },
-    "logBlockedRequestsHeaderFilter" : {
+    "logRequestsHeaderFilter" : {
         "message": "Filter",
         "description": "English: Filter"
     },
@@ -133,6 +149,10 @@
         "message": "No blocked requests logged for this page",
         "description": "English: No blocked requests logged for this page"
     },
+    "logAllowedRequestsEmpty" : {
+        "message": "No non-blocked requests logged for this page",
+        "description": "English: No non-blocked requests logged for this page"
+    },
 
 
     "aboutChangelog" : {

_locales/zh_CN/messages.json

@@ -113,19 +113,35 @@
         "message": "如果你想要开启此选项，你将可以查看拦截广告的详情。拦截记录会增加µBlock的内存占用。由于很多用户用不到这个功能，它默认是禁用的。",
         "description": "English: see _locales/en/messages.log"
     },
-    "logBlockedRequestsHeaderType" : {
+    "logAllowedRequestsPrompt" : {
+        "message": "Enable the logging of non-blocked requests",
+        "description": "English: Enable the logging of non-blocked requests"
+    },
+    "logAllowedRequestsHelp" : {
+        "message": "You can inspect the details of non-blocked requests if you wish by enabling this option. The logging of non-blocked requests increases the memory footprint of µBlock. Since many users will never use this feature, it is disabled by default.",
+        "description": "English: see _locales/en/messages.log"
+    },
+    "logBlockedRequestsHeader" : {
+        "message": "Blocked requests",
+        "description": "English: Blocked requests"
+    },
+    "logAllowedRequestsHeader" : {
+        "message": "Allowed requests",
+        "description": "English: Allowed requests"
+    },
+    "logRequestsHeaderType" : {
         "message": "类型",
         "description": "English: Type"
     },
-    "logBlockedRequestsHeaderDomain" : {
+    "logRequestsHeaderDomain" : {
         "message": "域名",
         "description": "English: Domain"
     },
-    "logBlockedRequestsHeaderURL" : {
+    "logRequestsHeaderURL" : {
-        "message": "屏蔽网站",
+        "message": "网址",
-        "description": "English: Blocked URL"
+        "description": "English: URL"
     },
-    "logBlockedRequestsHeaderFilter" : {
+    "logRequestsHeaderFilter" : {
         "message": "过滤",
         "description": "English: Filter"
     },
@@ -133,6 +149,10 @@
         "message": "该页面没有拦截记录",
         "description": "English: No blocked requests logged for this page"
     },
+    "logAllowedRequestsEmpty" : {
+        "message": "No non-blocked requests logged for this page",
+        "description": "English: No non-blocked requests logged for this page"
+    },
 
 
     "aboutChangelog" : {

dist/it/description.txt

@@ -36,14 +36,6 @@ Senza queste liste di filtri, questa estensione non è niente. Così se vuoi con
 
 ***
 
-Poichè le recensioni non consentono all'autore di rispondere, ho deciso di rispondere attraverso il sito principale del progetto.
-
-https://github.com/gorhill/uBlock/wiki/My-answer-to-web-store-reviews-where-appropriate
-
-***
-
-Dall'autore di HTTP Switchboard.
-
 Gratuito.
 Open source with public license (GPLv3)
 Fatto dagli utenti per gli utenti.

js/abp-filters.js

@@ -1415,17 +1415,16 @@ FilterContainer.prototype.matchString = function(pageDetails, url, requestType,
     var categories = this.categories;
 
     // Test hostname-based block filters
-    var bf = false;
+    var br = this.matchAnyPartyHostname(requestHostname);
-    bf = this.matchAnyPartyHostname(requestHostname);
+    if ( br === false && party === ThirdParty ) {
-    if ( bf === false && party === ThirdParty ) {
+        br = this.match3rdPartyHostname(requestHostname);
-        bf = this.match3rdPartyHostname(requestHostname);
     }
 
     // This will be used by hostname-based filters
     pageHostname = pageDetails.pageHostname || '';
 
     // Test against block filters
-    if ( bf === false ) {
+    if ( br === false ) {
         this.bucket0 = categories[this.makeCategoryKey(BlockAnyTypeAnyParty)];
         this.bucket1 = categories[this.makeCategoryKey(BlockAnyType | party)];
         this.bucket2 = categories[this.makeCategoryKey(BlockAnyTypeOneParty | domainParty)];
@@ -1435,11 +1434,11 @@ FilterContainer.prototype.matchString = function(pageDetails, url, requestType,
         this.bucket6 = categories[this.makeCategoryKey(BlockOneParty | type | domainParty)];
         this.bucket7 = categories[this.makeCategoryKey(BlockOtherParties | type)];
 
-        bf = this.matchTokens();
+        br = this.matchTokens();
     }
 
     // If there is no block filter, no need to test against allow filters
-    if ( bf === false ) {
+    if ( br === false ) {
         return false;
     }
 
@@ -1453,11 +1452,12 @@ FilterContainer.prototype.matchString = function(pageDetails, url, requestType,
     this.bucket6 = categories[this.makeCategoryKey(AllowOneParty | type | domainParty)];
     this.bucket7 = categories[this.makeCategoryKey(AllowOtherParties | type | domainParty)];
 
-    if ( this.matchTokens() !== false ) {
+    var ar = this.matchTokens();
-        return false;
+    if ( ar !== false ) {
+        return '@@' + ar;
     }
 
-    return bf;
+    return br;
 };
 
 /******************************************************************************/

js/async.js

@@ -133,7 +133,7 @@ return asyncJobManager;
 // Update visual of extension icon.
 // A time out is used to coalesce adjacent requests to update badge.
 
-µBlock.updateBadge = function(tabId) {
+µBlock.updateBadgeAsync = function(tabId) {
     if ( tabId < 0 ) {
         return;
     }

js/background.js

@@ -33,6 +33,7 @@ return {
     userSettings: {
         collapseBlocked: true,
         logBlockedRequests: false,
+        logAllowedRequests: false,
         parseAllABPHideFilters: true,
         netExceptionList: {},
         showIconBadge: true

js/messaging-handlers.js

@@ -40,7 +40,8 @@ var getStats = function(request) {
         pageAllowedRequestCount: 0,
         netFilteringSwitch: false,
         cosmeticFilteringSwitch: false,
-        logBlockedRequests: µb.userSettings.logBlockedRequests
+        logBlockedRequests: µb.userSettings.logBlockedRequests,
+        logAllowedRequests: µb.userSettings.logAllowedRequests
     };
     var pageStore = µb.pageStoreFromTabId(request.tabId);
     if ( pageStore ) {
@@ -75,7 +76,7 @@ var onMessage = function(request, sender, callback) {
                 request.hostname,
                 request.state
             );
-            µBlock.updateBadge(request.tabId);
+            µBlock.updateBadgeAsync(request.tabId);
             break;
 
         default:
@@ -260,33 +261,43 @@ var onMessage = function(request, sender, callback) {
 
 var getPageDetails = function(µb, tabId) {
     var r = {
-        requests: [],
+        blockedRequests: [],
+        allowedRequests: [],
         hash: ''
     };
     var pageStore = µb.pageStores[tabId];
     if ( !pageStore ) {
         return r;
     }
-    var blockedRequests = pageStore.blockedRequests;
+    var prepareRequests = function(requests, hasher) {
-    var details, pos;
+        var r = [];
+        var details, pos;
+        for ( var requestURL in requests ) {
+            if ( requests.hasOwnProperty(requestURL) === false ) {
+                continue;
+            }
+            details = requests[requestURL];
+            if ( typeof details !== 'string' ) {
+                continue;
+            }
+            hasher.appendStr(requestURL);
+            hasher.appendStr(details);
+            pos = details.indexOf('\t');
+            r.push({
+                type: details.slice(0, pos),
+                domain: µb.URI.domainFromURI(requestURL),
+                url: requestURL,
+                reason: details.slice(pos + 1)
+            });
+        }
+        return r;
+    }
     var hasher = new YaMD5();
-    for ( var requestURL in blockedRequests ) {
+    if ( µb.userSettings.logBlockedRequests ) {
-        if ( blockedRequests.hasOwnProperty(requestURL) === false ) {
+        r.blockedRequests = prepareRequests(pageStore.blockedRequests, hasher);
-            continue;
+    }
-        }
+    if ( µb.userSettings.logAllowedRequests ) {
-        details = blockedRequests[requestURL];
+        r.allowedRequests = prepareRequests(pageStore.allowedRequests, hasher);
-        if ( typeof details !== 'string' ) {
-            continue;
-        }
-        hasher.appendStr(requestURL);
-        hasher.appendStr(details);
-        pos = details.indexOf('\t');
-        r.requests.push({
-            type: details.slice(0, pos),
-            domain: µb.URI.domainFromURI(requestURL),
-            url: requestURL,
-            reason: details.slice(pos + 1)
-        });
     }
     r.hash = hasher.end();
     return r;

js/pagestore.js

@@ -53,14 +53,6 @@ var pageStoreFactory = function(tabId, pageURL) {
 /******************************************************************************/
 
 function PageStore(tabId, pageURL) {
-    this.tabId = -1;
-    this.pageURL = '';
-    this.pageHostname = '';
-    this.pageDomain = '';
-    this.perLoadBlockedRequestCount = 0;
-    this.perLoadAllowedRequestCount = 0;
-    this.blockedRequests = {};
-    this.disposeTime = 0;
     this.init(tabId, pageURL);
 }
 
@@ -74,6 +66,7 @@ PageStore.prototype.init = function(tabId, pageURL) {
     this.perLoadBlockedRequestCount = 0;
     this.perLoadAllowedRequestCount = 0;
     this.blockedRequests = {};
+    this.allowedRequests = {};
     this.disposeTime = 0;
     return this;
 };
@@ -88,7 +81,7 @@ PageStore.prototype.dispose = function() {
     this.pageURL = '';
     this.pageHostname = '';
     this.pageDomain = '';
-    if ( pageStoreJunkyard.length < 32 ) {
+    if ( pageStoreJunkyard.length < 8 ) {
         pageStoreJunkyard.push(this);
     }
 };
@@ -96,17 +89,19 @@ PageStore.prototype.dispose = function() {
 /******************************************************************************/
 
 PageStore.prototype.recordRequest = function(type, url, reason) {
-    // rhill 2013-10-26: This needs to be called even if the request is
+    var blocked = reason !== false && reason.slice(0, 2) !== '@@';
-    // already logged, since the request stats are cached for a while after
-    // the page is no longer visible in a browser tab.
-    µb.updateBadge(this.tabId);
 
-    if ( reason === false ) {
+    if ( !blocked ) {
         this.perLoadAllowedRequestCount++;
         µb.localSettings.allowedRequestCount++;
+        if ( µb.userSettings.logAllowedRequests ) {
+            this.allowedRequests[url] = type + '\t' + (reason || '');
+        }
         return;
     }
 
+    µb.updateBadgeAsync(this.tabId);
+
     this.perLoadBlockedRequestCount++;
     µb.localSettings.blockedRequestCount++;
 

js/popup.js

@@ -70,7 +70,7 @@ var renderStats = function() {
 
     uDom('#gotoLog').toggleClass(
         'enabled',
-        stats.netFilteringSwitch && stats.logBlockedRequests
+        stats.logBlockedRequests || stats.logAllowedRequests
     );
 
     var blocked = stats.pageBlockedRequestCount;

js/stats.js

@@ -31,13 +31,27 @@ messaging.start('stats.js');
 
 /******************************************************************************/
 
-var logSettingChanged = function() {
+var logBlockedSettingChanged = function() {
     messaging.tell({
         what: 'userSettings',
         name: 'logBlockedRequests',
         value: this.checked
     });
-    uDom('#blockedRequests').toggleClass('logEnabled', this.checked);
+    uDom('#requests table').toggleClass('hideBlocked', !this.checked);
+    uDom('#requests').toggleClass('logEnabled', this.checked || uDom('#logAllowedRequests').prop('checked'));
+    renderPageSelector();
+};
+
+/******************************************************************************/
+
+var logAllowedSettingChanged = function() {
+    messaging.tell({
+        what: 'userSettings',
+        name: 'logAllowedRequests',
+        value: this.checked
+    });
+    uDom('#requests table').toggleClass('hideAllowed', !this.checked);
+    uDom('#requests').toggleClass('logEnabled', this.checked || uDom('#logBlockedRequests').prop('checked'));
     renderPageSelector();
 };
 
@@ -47,9 +61,10 @@ var cachedPageSelectors = {};
 var cachedPageHash = '';
 
 var toPrettyTypeNames = {
-         'sub_frame': 'frame',
+         'stylesheet': 'css',
-            'object': 'plugin',
+          'sub_frame': 'frame',
-    'xmlhttprequest': 'XHR'
+             'object': 'plugin',
+     'xmlhttprequest': 'XHR'
 };
 
 /******************************************************************************/
@@ -62,6 +77,9 @@ var renderURL = function(url, filter) {
     if ( pos > 0 ) {
         reText = reText.slice(0, pos);
     }
+    if ( reText.slice(0, 2) === '@@' ) {
+        reText = reText.slice(2);
+    }
     reText = reText
         .replace(/\./g, '\\.')
         .replace(/\?/g, '\\?')
@@ -112,41 +130,40 @@ var renderPageDetails = function(tabId) {
         if ( details.hash === cachedPageHash ) {
             return;
         }
-        var blockedRequests = details.requests || [];
-        blockedRequests.sort(function(a, b) {
-            var r = a.domain.localeCompare(b.domain);
-            if ( r === 0 ) {
-                r = a.reason.localeCompare(b.reason);
-                if ( r === 0 ) {
-                    r = a.type.localeCompare(b.type);
-                }
-            }
-            return r;
-        });
-
-        uDom('#tableHeader ~ tr').remove();
-
-        var blockedRequest, requestURL;
-        var html = [];
-
-        for ( var i = 0; i < blockedRequests.length; i++ ) {
-            blockedRequest = blockedRequests[i];
-            html.push(
-                '<tr>',
-                '<td>', toPrettyTypeNames[blockedRequest.type] || blockedRequest.type,
-                '<td>', blockedRequest.domain,
-                '<td>', renderURL(blockedRequest.url, blockedRequest.reason),
-                '<td>', blockedRequest.reason
-            );
-        }
-        if ( !html.length ) {
-            html.push(
-                '<tr><td colspan="4">',
-                chrome.i18n.getMessage('logBlockedRequestsEmpty')
-            );
-        }
-        uDom('#tableHeader').insertAfter(html.join(''));
         cachedPageHash = details.hash;
+        var renderRequests = function(requests, className) {
+            requests.sort(function(a, b) {
+                var r = a.domain.localeCompare(b.domain);
+                if ( r ) { return r; }
+                r = a.reason.localeCompare(b.reason);
+                if ( r ) { return r; }
+                r = a.type.localeCompare(b.type);
+                if ( r ) { return r; }
+                return a.url.localeCompare(b.url);
+            });
+            var html = [], request;
+            html.push(
+                '<tr class="header ', className, '">',
+                '<td colspan="4"><h3>',
+                chrome.i18n.getMessage(className + (requests.length ? 'RequestsHeader' : 'RequestsEmpty')),
+                '</h3>'
+            );
+            for ( var i = 0; i < requests.length; i++ ) {
+                request = requests[i];
+                html.push(
+                    '<tr class="', className, '">',
+                    '<td>', request.domain,
+                    '<td>', toPrettyTypeNames[request.type] || request.type,
+                    '<td>', renderURL(request.url, request.reason),
+                    '<td>', request.reason || ''
+                );
+            }
+            return html;
+        };
+        uDom('#requests .tableHeader ~ tr').remove();
+        var htmlBlocked = renderRequests(details.blockedRequests || [], 'logBlocked');
+        var htmlAllowed = renderRequests(details.allowedRequests || [], 'logAllowed');
+        uDom('#requests .tableHeader').insertAfter(htmlBlocked.concat(htmlAllowed).join(''));
     };
 
     messaging.ask({ what: 'getPageDetails', tabId: tabId }, onDataReceived);
@@ -161,11 +178,14 @@ var pageSelectorChanged = function() {
 /******************************************************************************/
 
 var renderPageSelector = function(targetTabId) {
-    if ( uDom('#logBlockedRequests').prop('checked') !== true ) {
+    if ( !uDom('#logBlockedRequests').prop('checked') && !uDom('#logAllowedRequests').prop('checked') ) {
         return;
     }
     var selectedTabId = targetTabId || parseInt(uDom('#pageSelector').val(), 10);
     var onTabReceived = function(tab) {
+        if ( !tab ) {
+            return;
+        }
         var html = [
             '<option value="',
             tab.id,
@@ -200,13 +220,17 @@ var renderPageSelector = function(targetTabId) {
 
 var onUserSettingsReceived = function(details) {
     uDom('#logBlockedRequests').prop('checked', details.logBlockedRequests);
-    uDom('#blockedRequests').toggleClass('logEnabled', details.logBlockedRequests);
+    uDom('#logAllowedRequests').prop('checked', details.logAllowedRequests);
+    uDom('#requests').toggleClass('logEnabled', details.logBlockedRequests || details.logAllowedRequests);
+    uDom('#requests table').toggleClass('hideBlocked', !details.logBlockedRequests);
+    uDom('#requests table').toggleClass('hideAllowed', !details.logAllowedRequests);
 
     var matches = window.location.search.slice(1).match(/(?:^|&)which=(\d+)/);
     var tabId = matches && matches.length === 2 ? parseInt(matches[1], 10) : 0;
     renderPageSelector(tabId);
 
-    uDom('#logBlockedRequests').on('change', logSettingChanged);
+    uDom('#logBlockedRequests').on('change', logBlockedSettingChanged);
+    uDom('#logAllowedRequests').on('change', logAllowedSettingChanged);
     uDom('#refresh').on('click', function() { renderPageSelector(); });
     uDom('#pageSelector').on('change', pageSelectorChanged);
 };

js/tab.js

@@ -24,43 +24,29 @@
 /******************************************************************************/
 
 (function(){
-    function onTabCreated(tab) {
+    // When the DOM content of root frame is loaded, this means the tab
-        // Can this happen?
+    // content has changed.
-        if ( tab.id < 0 || !tab.url || tab.url === '' ) {
+    function onDOMContentLoaded(details) {
+        if ( details.frameId !== 0 ) {
             return;
         }
-        µBlock.bindTabToPageStats(tab.id, tab.url);
+        µBlock.updateBadgeAsync(details.tabId);
     }
-    chrome.tabs.onCreated.addListener(onTabCreated);
+    chrome.webNavigation.onDOMContentLoaded.addListener(onDOMContentLoaded);
 
+    // It may happen the URL in the tab changes, while the page's document
+    // stays the same (for instance, Google Maps). Without this listener,
+    // the extension icon won't be properly refreshed.
     function onTabUpdated(tabId, changeInfo, tab) {
-        // Can this happen?
         if ( !tab.url || tab.url === '' ) {
             return;
         }
-        if ( changeInfo.url ) {
+        if ( changeInfo.url && µBlock.pageStores[tabId] ) {
-            µBlock.bindTabToPageStats(tabId, tab.url);
+            µBlock.updateBadgeAsync(tabId);
-            µBlock.updateBadge(tabId);
         }
     }
     chrome.tabs.onUpdated.addListener(onTabUpdated);
 
-    function onTabRemoved(tabId) {
-        if ( tabId < 0 ) {
-            return;
-        }
-        µBlock.unbindTabFromPageStats(tabId);
-    }
-    chrome.tabs.onRemoved.addListener(onTabRemoved);
-
-    function onBeforeNavigateCallback(details) {
-        if ( details.frameId > 0 ) {
-            return;
-        }
-        µBlock.bindTabToPageStats(details.tabId, details.url);
-    }
-    chrome.webNavigation.onBeforeNavigate.addListener(onBeforeNavigateCallback);
-
     // Initialize internal state with maybe already existing tabs
     chrome.tabs.query({ url: '<all_urls>' }, function(tabs) {
         var i = tabs.length;
@@ -96,6 +82,8 @@
 // Create an entry for the tab if it doesn't exist.
 
 µBlock.bindTabToPageStats = function(tabId, pageURL) {
+    this.updateBadgeAsync(tabId);
+
     // First unbind whatever page store is bound to the tab id.
     this.unbindTabFromPageStats(tabId);
 
@@ -124,6 +112,7 @@
         pageStore.perLoadBlockedRequestCount = 0;
     }
 
+    //console.log('µBlock> bindTabToPageStats(%d, "%s")', tabId, pageURL);
     this.pageStores[tabId] = pageStore;
 
     return pageStore;
@@ -134,6 +123,7 @@
     if ( pageStore ) {
         //pageStore.disposeTime = Date.now();
         //this.pageStoreDump[pageStore.pageURL + ' ' + tabId] = pageStore;
+        //console.log('µBlock> unbindTabFromPageStats(%d)', tabId);
     }
     delete this.pageStores[tabId];
 };

js/traffic.js

@@ -84,7 +84,7 @@ var onBeforeRequestHandler = function(details) {
     pageStore.recordRequest(requestType, requestURL, reason);
 
     // Not blocked?
-    if ( reason === false ) {
+    if ( reason === false || reason.slice(0, 2) === '@@' ) {
         return;
     }
 

js/udom.js

@@ -416,7 +416,7 @@ DOMList.prototype.toggleClass = function(className, targetState) {
     for ( var i = 0; i < n; i++ ) {
         node = this.nodes[i];
         currentState = re.test(node.className);
-        newState = targetState;
+        newState = !!targetState;
         if ( newState === undefined ) {
             newState = !currentState;
         }
@@ -427,7 +427,7 @@ DOMList.prototype.toggleClass = function(className, targetState) {
         if ( newState ) {
             newClassName += ' ' + className;
         } else {
-            newClassName = newClassName.replace(re, '');
+            newClassName = newClassName.replace(re, ' ');
         }
         node.className = newClassName.trim();
     }

stats.html

@@ -24,6 +24,13 @@ select {
     padding: 2px 0;
     font-size: 14px;
     }
+#requests {
+    margin: 2em 0 0 0;
+    display: none;
+    }
+#requests.logEnabled {
+    display: block;
+    }
 table {
     margin: 1em 0;
     border: 1px solid gray;
@@ -36,23 +43,36 @@ td, th {
     padding: 6px 6px;
     white-space: pre;
     }
-td:nth-of-type(2) {
+td:nth-of-type(1), td:nth-of-type(2) {
     text-align: right;
     }
+tr.header td:nth-of-type(1) {
+    text-align: left;
+    }
 td:nth-of-type(3) {
     color: #444;
     }
-td:nth-of-type(3) b {
+table.hideBlocked tr.logBlocked {
-    padding: 2px 0;
-    color: #000;
-    background-color: #ff8;
-    }
-#blockedRequests {
-    margin: 2em 0 0 0;
     display: none;
     }
-#blockedRequests.logEnabled {
+table.hideAllowed tr.logAllowed {
-    display: block;
+    display: none;
+    }
+tr.logBlocked {
+    background-color: #fff8f8;
+    }
+tr.logBlocked ~ tr td:nth-of-type(3) b {
+    padding: 2px 0;
+    color: #000;
+    background-color: rgba(255,0,0,0.1);
+    }
+tr.logAllowed {
+    background-color: #f8fff8 !important;
+    }
+tr.logAllowed ~ tr td:nth-of-type(3) b {
+    padding: 2px 0;
+    color: #000;
+    background-color: rgba(0,255,0,0.2);
     }
 </style>
 </head>
@@ -63,17 +83,20 @@ td:nth-of-type(3) b {
     <li><input id="logBlockedRequests" type="checkbox" data-range="bool" /><span data-i18n="logBlockedRequestsPrompt"></span>
     <button class="whatisthis"></button>
     <div class="whatisthis-expandable para" data-i18n="logBlockedRequestsHelp"></div>
+    <li><input id="logAllowedRequests" type="checkbox" data-range="bool" /><span data-i18n="logAllowedRequestsPrompt"></span>
+    <button class="whatisthis"></button>
+    <div class="whatisthis-expandable para" data-i18n="logAllowedRequestsHelp"></div>
 </ul>
 
-<div id="blockedRequests">
+<div id="requests">
 <span id="refresh" class="fa">&#xf021;</span><select id="pageSelector"></select>
 
-<table id="pageDetails">
+<table>
-<tr id="tableHeader">
+<tr class="tableHeader">
-<th data-i18n="logBlockedRequestsHeaderType">
+<th data-i18n="logRequestsHeaderDomain">
-<th data-i18n="logBlockedRequestsHeaderDomain">
+<th data-i18n="logRequestsHeaderType">
-<th data-i18n="logBlockedRequestsHeaderURL">
+<th data-i18n="logRequestsHeaderURL">
-<th data-i18n="logBlockedRequestsHeaderFilter">
+<th data-i18n="logRequestsHeaderFilter">
 </table>
 
 </div>