diff --git a/README.md b/README.md index 18eedb9f0785b..b750119d5f8e8 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ While most of the code in this extension is shared with [upstream](https://githu ## Issues -Known issues, bugs and missing features are listed on the [Issues page](https://github.com/nikrolls/uBlock-Edge/issues) for this repo. Features documented in the upstream extension and not listed on the Issues page are assumed to be working. If you run into an issue not listed, please [create a new issue](https://github.com/nikrolls/uBlock-Edge/issues) and complete the provided template. +In the first instance, issues should be reported in [uBlock’s section of the Feedback Hub](feedback-hub://?tabid=2&appid=37833NikRolls.uBlockOrigin_f8jsg5mm64m62!App). If this is not working for you, please [create a new GitHub issue](https://github.com/nikrolls/uBlock-Edge/issues) and complete the provided template. ## Performance and Efficiency diff --git a/dist/description/description-da.txt b/dist/description/description-da.txt index 320a7bb9a460f..0eb6f46f4ba62 100644 --- a/dist/description/description-da.txt +++ b/dist/description/description-da.txt @@ -1,8 +1,8 @@ En effektiv blocker: let på hukommelse og CPU forbrug,. Kan indlæse og anvende tusindvis af flere filtre end andre populære blockere derude. -Illustreret oversigt over effektiviteten: https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP :-Efficiency-compared +Illustreret oversigt over effektiviteten: https://github.com/gorhill/uBlock/wiki/uBlock-vs.-ABP:-Efficiency-compared -Anvendelse: Den Store power knap i pop-up-vinduet kan permanent deaktivere/aktivere uBlock på det aktuelle websted. Dette gælder kun for det aktuelle websted, det er ikke en global afbryderknap. +Anvendelse: Den store tænd-sluk-knap i pop op-vinduet bruges til permanent at deaktivere/aktivere uBlock på det aktuelle websted. Dette gælder kun for det aktuelle websted, det er ikke en global afbryderknap. *** @@ -24,7 +24,7 @@ Flere lister er tilgængelige hvis du ønsker det: - Spam404 - Osv. -Selvfølgelig vil flere aktive filtre betyde højere hukommelsesforbrug. Selv efter tilføjelse af Fanboys to ekstra lister, og hpHosts’s Ad and tracking servers, har uBlock₀ stadig et lavere hukommelsesforbrug end andre blokere derude. +Selvfølgelig vil flere aktive filtre betyde højere hukommelsesforbrug. Men selv efter tilføjelse af Fanboys to ekstra lister, samt hpHosts’s Ad and tracking servers, har uBlock stadig et lavere hukommelsesforbrug end andre meget populære blockere derude. Vær desuden opmærksom på, at hvis du vælger nogle af disse ekstra lister kan det føre til højere sandsynlighed for, at webstedet bliver vist forkert - især de lister der normalt anvendes som hosts-fil. diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json index b17c8120e87d7..0eb0f71835b0c 100644 --- a/platform/chromium/manifest.json +++ b/platform/chromium/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "uBlock Origin", - "version": "1.11.0", + "version": "1.11.2", "default_locale": "en", "description": "__MSG_extShortDesc__", diff --git a/platform/chromium/vapi-background.js b/platform/chromium/vapi-background.js index 63290d47b6ab0..2a4fdd66dfc61 100644 --- a/platform/chromium/vapi-background.js +++ b/platform/chromium/vapi-background.js @@ -976,16 +976,23 @@ vAPI.net.registerListeners = function() { // logger, etc. // Counterpart of following block of code is found in "vapi-client.js" -- // search for "https://github.com/gorhill/uBlock/issues/1497". + // + // Once uBO 1.11.1 and uBO-Extra 2.12 are widespread, the image-based + // handling code can be removed. var onBeforeWebsocketRequest = function(details) { + if ( (details.type !== 'image') && + (details.method !== 'HEAD' || details.type !== 'xmlhttprequest') + ) { + return; + } + var requestURL = details.url, + matches = /[?&]u(?:rl)?=([^&]+)/.exec(requestURL); + if ( matches === null ) { return; } details.type = 'websocket'; - var requestURL = details.url; - var matches = /[?&]url=([^&]+)/.exec(requestURL); details.url = decodeURIComponent(matches[1]); var r = onBeforeRequestClient(details); - // Blocked? if ( r && r.cancel ) { return r; } - // Try to redirect to the URL of an image already present in the - // document, or a 1x1 data: URL if none is present. + // Redirect to the provided URL, or a 1x1 data: URI if none provided. matches = /[?&]r=([^&]+)/.exec(requestURL); return { redirectUrl: matches !== null ? @@ -997,11 +1004,9 @@ vAPI.net.registerListeners = function() { var onBeforeRequestClient = this.onBeforeRequest.callback; var onBeforeRequest = function(details) { // https://github.com/gorhill/uBlock/issues/1497 - if ( - details.type === 'image' && - details.url.endsWith('ubofix=f41665f3028c7fd10eecf573336216d3') - ) { - return onBeforeWebsocketRequest(details); + if ( details.url.endsWith('ubofix=f41665f3028c7fd10eecf573336216d3') ) { + var r = onBeforeWebsocketRequest(details); + if ( r !== undefined ) { return r; } } normalizeRequestDetails(details); diff --git a/platform/edge/about.html b/platform/edge/about.html index da2a5445bd908..42bb3ae6c4f3c 100644 --- a/platform/edge/about.html +++ b/platform/edge/about.html @@ -13,6 +13,7 @@