Skip to content

Commit ee610b3

Browse files
gorhillgorhill
committed
toward 0.1.4.0
1 parent aa84651 commit ee610b3

17 files changed

+307
-171
lines changed

‎_locales/en/messages.json‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,26 +113,46 @@
113113
"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.",
114114
"description": "English: see _locales/en/messages.log"
115115
},
116-
"logBlockedRequestsHeaderType" : {
116+
"logAllowedRequestsPrompt" : {
117+
"message": "Enable the logging of non-blocked requests",
118+
"description": "English: Enable the logging of non-blocked requests"
119+
},
120+
"logAllowedRequestsHelp" : {
121+
"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.",
122+
"description": "English: see _locales/en/messages.log"
123+
},
124+
"logBlockedRequestsHeader" : {
125+
"message": "Blocked requests",
126+
"description": "English: Blocked requests"
127+
},
128+
"logAllowedRequestsHeader" : {
129+
"message": "Allowed requests",
130+
"description": "English: Allowed requests"
131+
},
132+
"logRequestsHeaderType" : {
117133
"message": "Type",
118134
"description": "English: Type"
119135
},
120-
"logBlockedRequestsHeaderDomain" : {
136+
"logRequestsHeaderDomain" : {
121137
"message": "Domain",
122138
"description": "English: Domain"
123139
},
124-
"logBlockedRequestsHeaderURL" : {
125-
"message": "Blocked URL",
126-
"description": "English: Blocked URL"
140+
"logRequestsHeaderURL" : {
141+
"message": "URL",
142+
"description": "English: URL"
127143
},
128-
"logBlockedRequestsHeaderFilter" : {
144+
"logRequestsHeaderFilter" : {
129145
"message": "Filter",
130146
"description": "English: Filter"
131147
},
132148
"logBlockedRequestsEmpty" : {
133149
"message": "No blocked requests logged for this page",
134150
"description": "English: No blocked requests logged for this page"
135151
},
152+
"logAllowedRequestsEmpty" : {
153+
"message": "No non-blocked requests logged for this page",
154+
"description": "English: No non-blocked requests logged for this page"
155+
},
136156

137157

138158
"aboutChangelog" : {

‎_locales/fr/messages.json‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,26 +113,46 @@
113113
"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.",
114114
"description": "English: see _locales/en/messages.log"
115115
},
116-
"logBlockedRequestsHeaderType" : {
116+
"logAllowedRequestsPrompt" : {
117+
"message": "Activer la journalisation des requêtes permises",
118+
"description": "English: Enable the logging of non-blocked requests"
119+
},
120+
"logAllowedRequestsHelp" : {
121+
"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.",
122+
"description": "English: see _locales/en/messages.log"
123+
},
124+
"logBlockedRequestsHeader" : {
125+
"message": "Requêtes bloquées",
126+
"description": "English: Blocked requests"
127+
},
128+
"logAllowedRequestsHeader" : {
129+
"message": "Requêtes permises",
130+
"description": "English: Allowed requests"
131+
},
132+
"logRequestsHeaderType" : {
117133
"message": "Type",
118134
"description": "English: Type"
119135
},
120-
"logBlockedRequestsHeaderDomain" : {
136+
"logRequestsHeaderDomain" : {
121137
"message": "Domaine",
122-
"description": "English: Domaine"
138+
"description": "English: Domain"
123139
},
124-
"logBlockedRequestsHeaderURL" : {
125-
"message": "URL bloquée",
126-
"description": "English: Blocked URL"
140+
"logRequestsHeaderURL" : {
141+
"message": "URL",
142+
"description": "English: URL"
127143
},
128-
"logBlockedRequestsHeaderFilter" : {
144+
"logRequestsHeaderFilter" : {
129145
"message": "Filtre",
130146
"description": "English: Filter"
131147
},
132148
"logBlockedRequestsEmpty" : {
133149
"message": "Il n'y a aucune requête bloquée dans le journal",
134150
"description": "English: No blocked requests logged for this page"
135151
},
152+
"logAllowedRequestsEmpty" : {
153+
"message": "Il n'y a aucune requête non-bloquée dans le journal",
154+
"description": "English: No non-blocked requests logged for this page"
155+
},
136156

137157

138158
"aboutChangelog" : {

‎_locales/it/messages.json‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,26 +113,46 @@
113113
"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.",
114114
"description": "English: see _locales/en/messages.log"
115115
},
116-
"logBlockedRequestsHeaderType" : {
116+
"logAllowedRequestsPrompt" : {
117+
"message": "Enable the logging of non-blocked requests",
118+
"description": "English: Enable the logging of non-blocked requests"
119+
},
120+
"logAllowedRequestsHelp" : {
121+
"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.",
122+
"description": "English: see _locales/en/messages.log"
123+
},
124+
"logBlockedRequestsHeader" : {
125+
"message": "Richieste bloccate",
126+
"description": "English: Blocked requests"
127+
},
128+
"logAllowedRequestsHeader" : {
129+
"message": "Allowed requests",
130+
"description": "English: Allowed requests"
131+
},
132+
"logRequestsHeaderType" : {
117133
"message": "Tipo",
118134
"description": "English: Type"
119135
},
120-
"logBlockedRequestsHeaderDomain" : {
136+
"logRequestsHeaderDomain" : {
121137
"message": "Dominio",
122138
"description": "English: Domain"
123139
},
124-
"logBlockedRequestsHeaderURL" : {
125-
"message": "Indirizzo bloccato",
126-
"description": "English: Blocked URL"
140+
"logRequestsHeaderURL" : {
141+
"message": "Indirizzo",
142+
"description": "English: URL"
127143
},
128-
"logBlockedRequestsHeaderFilter" : {
144+
"logRequestsHeaderFilter" : {
129145
"message": "Filtro",
130146
"description": "English: Filter"
131147
},
132148
"logBlockedRequestsEmpty" : {
133-
"message": "Nel registro, non ci sono richieste bloccate per questa pagina.",
149+
"message": "Nel registro, non ci sono richieste bloccate per questa pagina",
134150
"description": "English: No blocked requests logged for this page"
135151
},
152+
"logAllowedRequestsEmpty" : {
153+
"message": "No non-blocked requests logged for this page",
154+
"description": "English: No non-blocked requests logged for this page"
155+
},
136156

137157

138158
"aboutChangelog" : {

‎_locales/ru/messages.json‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,26 +113,46 @@
113113
"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.",
114114
"description": "English: see _locales/en/messages.log"
115115
},
116-
"logBlockedRequestsHeaderType" : {
116+
"logAllowedRequestsPrompt" : {
117+
"message": "Enable the logging of non-blocked requests",
118+
"description": "English: Enable the logging of non-blocked requests"
119+
},
120+
"logAllowedRequestsHelp" : {
121+
"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.",
122+
"description": "English: see _locales/en/messages.log"
123+
},
124+
"logBlockedRequestsHeader" : {
125+
"message": "Blocked requests",
126+
"description": "English: Blocked requests"
127+
},
128+
"logAllowedRequestsHeader" : {
129+
"message": "Allowed requests",
130+
"description": "English: Allowed requests"
131+
},
132+
"logRequestsHeaderType" : {
117133
"message": "Type",
118134
"description": "English: Type"
119135
},
120-
"logBlockedRequestsHeaderDomain" : {
136+
"logRequestsHeaderDomain" : {
121137
"message": "Domain",
122138
"description": "English: Domain"
123139
},
124-
"logBlockedRequestsHeaderURL" : {
125-
"message": "Blocked URL",
126-
"description": "English: Blocked URL"
140+
"logRequestsHeaderURL" : {
141+
"message": "URL",
142+
"description": "English: URL"
127143
},
128-
"logBlockedRequestsHeaderFilter" : {
144+
"logRequestsHeaderFilter" : {
129145
"message": "Filter",
130146
"description": "English: Filter"
131147
},
132148
"logBlockedRequestsEmpty" : {
133149
"message": "No blocked requests logged for this page",
134150
"description": "English: No blocked requests logged for this page"
135151
},
152+
"logAllowedRequestsEmpty" : {
153+
"message": "No non-blocked requests logged for this page",
154+
"description": "English: No non-blocked requests logged for this page"
155+
},
136156

137157

138158
"aboutChangelog" : {

‎_locales/zh_CN/messages.json‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,26 +113,46 @@
113113
"message": "如果你想要开启此选项，你将可以查看拦截广告的详情。拦截记录会增加µBlock的内存占用。由于很多用户用不到这个功能，它默认是禁用的。",
114114
"description": "English: see _locales/en/messages.log"
115115
},
116-
"logBlockedRequestsHeaderType" : {
116+
"logAllowedRequestsPrompt" : {
117+
"message": "Enable the logging of non-blocked requests",
118+
"description": "English: Enable the logging of non-blocked requests"
119+
},
120+
"logAllowedRequestsHelp" : {
121+
"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.",
122+
"description": "English: see _locales/en/messages.log"
123+
},
124+
"logBlockedRequestsHeader" : {
125+
"message": "Blocked requests",
126+
"description": "English: Blocked requests"
127+
},
128+
"logAllowedRequestsHeader" : {
129+
"message": "Allowed requests",
130+
"description": "English: Allowed requests"
131+
},
132+
"logRequestsHeaderType" : {
117133
"message": "类型",
118134
"description": "English: Type"
119135
},
120-
"logBlockedRequestsHeaderDomain" : {
136+
"logRequestsHeaderDomain" : {
121137
"message": "域名",
122138
"description": "English: Domain"
123139
},
124-
"logBlockedRequestsHeaderURL" : {
125-
"message": "屏蔽网站",
126-
"description": "English: Blocked URL"
140+
"logRequestsHeaderURL" : {
141+
"message": "网址",
142+
"description": "English: URL"
127143
},
128-
"logBlockedRequestsHeaderFilter" : {
144+
"logRequestsHeaderFilter" : {
129145
"message": "过滤",
130146
"description": "English: Filter"
131147
},
132148
"logBlockedRequestsEmpty" : {
133149
"message": "该页面没有拦截记录",
134150
"description": "English: No blocked requests logged for this page"
135151
},
152+
"logAllowedRequestsEmpty" : {
153+
"message": "No non-blocked requests logged for this page",
154+
"description": "English: No non-blocked requests logged for this page"
155+
},
136156

137157

138158
"aboutChangelog" : {

‎dist/it/description.txt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,6 @@ Senza queste liste di filtri, questa estensione non è niente. Così se vuoi con
3636

3737
***
3838

39-
Poichè le recensioni non consentono all'autore di rispondere, ho deciso di rispondere attraverso il sito principale del progetto.
40-
41-
https://github.com/gorhill/uBlock/wiki/My-answer-to-web-store-reviews-where-appropriate
42-
43-
***
44-
45-
Dall'autore di HTTP Switchboard.
46-
4739
Gratuito.
4840
Open source with public license (GPLv3)
4941
Fatto dagli utenti per gli utenti.

‎js/abp-filters.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1415,17 +1415,16 @@ FilterContainer.prototype.matchString = function(pageDetails, url, requestType,
14151415
var categories = this.categories;
14161416

14171417
// Test hostname-based block filters
1418-
var bf = false;
1419-
bf = this.matchAnyPartyHostname(requestHostname);
1420-
if ( bf === false && party === ThirdParty ) {
1421-
bf = this.match3rdPartyHostname(requestHostname);
1418+
var br = this.matchAnyPartyHostname(requestHostname);
1419+
if ( br === false && party === ThirdParty ) {
1420+
br = this.match3rdPartyHostname(requestHostname);
14221421
}
14231422

14241423
// This will be used by hostname-based filters
14251424
pageHostname = pageDetails.pageHostname || '';
14261425

14271426
// Test against block filters
1428-
if ( bf === false ) {
1427+
if ( br === false ) {
14291428
this.bucket0 = categories[this.makeCategoryKey(BlockAnyTypeAnyParty)];
14301429
this.bucket1 = categories[this.makeCategoryKey(BlockAnyType | party)];
14311430
this.bucket2 = categories[this.makeCategoryKey(BlockAnyTypeOneParty | domainParty)];
@@ -1435,11 +1434,11 @@ FilterContainer.prototype.matchString = function(pageDetails, url, requestType,
14351434
this.bucket6 = categories[this.makeCategoryKey(BlockOneParty | type | domainParty)];
14361435
this.bucket7 = categories[this.makeCategoryKey(BlockOtherParties | type)];
14371436

1438-
bf = this.matchTokens();
1437+
br = this.matchTokens();
14391438
}
14401439

14411440
// If there is no block filter, no need to test against allow filters
1442-
if ( bf === false ) {
1441+
if ( br === false ) {
14431442
return false;
14441443
}
14451444

@@ -1453,11 +1452,12 @@ FilterContainer.prototype.matchString = function(pageDetails, url, requestType,
14531452
this.bucket6 = categories[this.makeCategoryKey(AllowOneParty | type | domainParty)];
14541453
this.bucket7 = categories[this.makeCategoryKey(AllowOtherParties | type | domainParty)];
14551454

1456-
if ( this.matchTokens() !== false ) {
1457-
return false;
1455+
var ar = this.matchTokens();
1456+
if ( ar !== false ) {
1457+
return '@@' + ar;
14581458
}
14591459

1460-
return bf;
1460+
return br;
14611461
};
14621462

14631463
/******************************************************************************/

‎js/async.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ return asyncJobManager;
133133
// Update visual of extension icon.
134134
// A time out is used to coalesce adjacent requests to update badge.
135135

136-
µBlock.updateBadge = function(tabId) {
136+
µBlock.updateBadgeAsync = function(tabId) {
137137
if ( tabId < 0 ) {
138138
return;
139139
}

‎js/background.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ return {
3333
userSettings: {
3434
collapseBlocked: true,
3535
logBlockedRequests: false,
36+
logAllowedRequests: false,
3637
parseAllABPHideFilters: true,
3738
netExceptionList: {},
3839
showIconBadge: true

0 commit comments

Comments
 (0)