gorhill / uMatrix

uMatrix: Point and click matrix to filter net requests according to source, destination and type
GNU General Public License v3.0
4.54k stars 470 forks source link

Minor fixes #1005

Closed xofe closed 5 years ago

xofe commented 5 years ago

Similar to my previous PR #839, here's another handful of minor fixes for things I've noticed when working on a personal build on uMatrix. Each change is independent, so if any aren't wanted I'm happy to rebase and drop that commit.

Fixes:

On a similar note, I've been using @rhendric's code cleaning changes posted in uBlockOrigin/uMatrix-issues#16 without any issues - I think they'd be worth merging in too.

gorhill commented 5 years ago

Looks all good to me, thank you very much.

xofe commented 5 years ago

You're welcome!

Any thoughts on the changes in https://github.com/gorhill/uMatrix/compare/master...rhendric:cleaning (uBlockOrigin/uMatrix-issues#16)? I didn't include them in this PR as I wasn't sure if the authorship would be preserved.

gorhill commented 5 years ago

The PR changed the semantic of the block count on the matrix filtering button, and I questioned that.

Looking again into it, I realize the matrix filtering button count badge is already broken anyways.

The intent was that the count reflects only what is blocked as a result of matrix filtering, not what is blocked as a result of other switches doing their work (you will notice the uMatrix icon badge differs from the matrix filtering button badge when you have referrer spoofing enabled).

But now I see it's broken anyways since resources blocked as a result of "Forbid mixed content" are reported on the matrix filtering button anyways.

So I will merge the request, keeping in mind there is still something to fix (unrelated to the PR) with regard to the matrix filtering button badge count.