Skip to content

Commit d50e767

Browse files
committed
1 parent b91f7ab commit d50e767

3 files changed

Lines changed: 3 additions & 17 deletions

File tree

platform/chromium/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"manifest_version": 2,
33

44
"name": "uBlock Origin",
5-
"version": "1.12.5.13",
5+
"version": "1.12.5.14",
66

77
"commands": {
88
"launch-element-zapper": {

src/js/traffic.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ var onBeforeBehindTheSceneRequest = function(details) {
336336
pageStore = µb.pageStoreFromTabId(vAPI.noTabId);
337337
if ( !pageStore ) { return; }
338338

339-
var result = '',
339+
var result = 0,
340340
context = pageStore.createContextFromPage(),
341341
requestType = details.type,
342342
requestURL = details.url;
@@ -376,9 +376,7 @@ var onBeforeBehindTheSceneRequest = function(details) {
376376
context.dispose();
377377

378378
// Not blocked
379-
if ( µb.isAllowResult(result) ) {
380-
return;
381-
}
379+
if ( result !== 1 ) { return; }
382380

383381
// Blocked
384382
return { 'cancel': true };

src/js/ublock.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -479,18 +479,6 @@ var reInvalidHostname = /[^a-z0-9.\-\[\]:]/,
479479

480480
/******************************************************************************/
481481

482-
µBlock.isBlockResult = function(result) {
483-
return typeof result === 'string' && result.charCodeAt(1) === 98 /* 'b' */;
484-
};
485-
486-
/******************************************************************************/
487-
488-
µBlock.isAllowResult = function(result) {
489-
return typeof result !== 'string' || result.charCodeAt(1) !== 98 /* 'b' */;
490-
};
491-
492-
/******************************************************************************/
493-
494482
µBlock.toggleHostnameSwitch = function(details) {
495483
if ( this.hnSwitches.toggleZ(details.name, details.hostname, !!details.deep, details.state) ) {
496484
this.saveHostnameSwitches();

0 commit comments

Comments
 (0)