toward 0.1.4.0

gorhill · Jul 6, 2014 · ee610b3 · ee610b3
1 parent aa84651
commit ee610b3
Show file tree

Hide file tree

Showing 17 changed files with 307 additions and 171 deletions.
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -113,26 +113,46 @@
         "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" : {
-        "message": "Blocked URL",
-        "description": "English: Blocked URL"
+    "logRequestsHeaderURL" : {
+        "message": "URL",
+        "description": "English: URL"
     },
-    "logBlockedRequestsHeaderFilter" : {
+    "logRequestsHeaderFilter" : {
         "message": "Filter",
         "description": "English: Filter"
     },
     "logBlockedRequestsEmpty" : {
         "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" : {

diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
@@ -113,26 +113,46 @@
         "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" : {
-        "message": "URL bloquée",
-        "description": "English: Blocked URL"
+    "logRequestsHeaderURL" : {
+        "message": "URL",
+        "description": "English: URL"
     },
-    "logBlockedRequestsHeaderFilter" : {
+    "logRequestsHeaderFilter" : {
         "message": "Filtre",
         "description": "English: Filter"
     },
     "logBlockedRequestsEmpty" : {
         "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" : {

diff --git a/_locales/it/messages.json b/_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" : {
-        "message": "Indirizzo bloccato",
-        "description": "English: Blocked URL"
+    "logRequestsHeaderURL" : {
+        "message": "Indirizzo",
+        "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" : {

diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json
@@ -113,26 +113,46 @@
         "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" : {
-        "message": "Blocked URL",
-        "description": "English: Blocked URL"
+    "logRequestsHeaderURL" : {
+        "message": "URL",
+        "description": "English: URL"
     },
-    "logBlockedRequestsHeaderFilter" : {
+    "logRequestsHeaderFilter" : {
         "message": "Filter",
         "description": "English: Filter"
     },
     "logBlockedRequestsEmpty" : {
         "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" : {

diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json
@@ -113,26 +113,46 @@
         "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" : {
-        "message": "屏蔽网站",
-        "description": "English: Blocked URL"
+    "logRequestsHeaderURL" : {
+        "message": "网址",
+        "description": "English: URL"
     },
-    "logBlockedRequestsHeaderFilter" : {
+    "logRequestsHeaderFilter" : {
         "message": "过滤",
         "description": "English: Filter"
     },
     "logBlockedRequestsEmpty" : {
         "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" : {

diff --git a/dist/it/description.txt b/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.

diff --git a/js/abp-filters.js b/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;
-    bf = this.matchAnyPartyHostname(requestHostname);
-    if ( bf === false && party === ThirdParty ) {
-        bf = this.match3rdPartyHostname(requestHostname);
+    var br = this.matchAnyPartyHostname(requestHostname);
+    if ( br === false && party === ThirdParty ) {
+        br = 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 ) {
-        return false;
+    var ar = this.matchTokens();
+    if ( ar !== false ) {
+        return '@@' + ar;
     }
 
-    return bf;
+    return br;
 };
 
 /******************************************************************************/

diff --git a/js/async.js b/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;
     }

diff --git a/js/background.js b/js/background.js
@@ -33,6 +33,7 @@ return {
     userSettings: {
         collapseBlocked: true,
         logBlockedRequests: false,
+        logAllowedRequests: false,
         parseAllABPHideFilters: true,
         netExceptionList: {},
         showIconBadge: true