Skip to content

Commit 5b79bf3

Browse files
committed
Work on vendor API abstraction, and near complete Safari support
1 parent 96c4e2e commit 5b79bf3

File tree

178 files changed

+2420
-1375
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+2420
-1375
lines changed

MANIFESTO.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
1. The **user decides** what web content is acceptable or not in their browser.
44

5-
The µBlock project does not support Adblock Plus' _"Acceptable Ads Manifesto"_,
6-
because the _"Acceptable Ads"_ marketing campaign is really the business
5+
The µBlock project does not support Adblock Plus' _"Acceptable Ads Manifesto"_,
6+
because the _"Acceptable Ads"_ marketing campaign is really the business
77
plan of a for-profit entity.
88

9-
Users are best placed to know what is or is not acceptable to them. µBlock's
9+
Users are best placed to know what is or is not acceptable to them. µBlock's
1010
sole purpose is to give users the mean to enforce their own choices.

README.md

+22-22
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
**Foreword:** Using a blocker is **NOT** [theft](https://twitter.com/LeaVerou/status/518154828166725632). Do not fall for this creepy idea. The _ultimate_ logical consequence of "blocking = theft" is the criminalisation of the inalienable right to privacy.
44

5-
See [releases page](https://github.com/gorhill/uBlock/releases) for recent changes.
5+
See [releases page](https://github.com/gorhill/uBlock/releases) for recent changes.
66
See [Wiki](https://github.com/gorhill/uBlock/wiki) for more information.
77

8-
An efficient blocker for Chromium-based browsers. Fast and lean. Written from scratch. Development
8+
An efficient blocker for Chromium-based browsers. Fast and lean. Written from scratch. Development
99
through benchmarking.
1010

1111
**µBlock is not an "ad blocker", it's a blocker in the broad sense**, which happens to block ads through its support of [Adblock Plus filter syntax](https://adblockplus.org/en/filters). µBlock [extends](https://github.com/gorhill/uBlock/wiki/Filter-syntax-extensions) the syntax.
@@ -25,31 +25,31 @@ My main goal with µBlock is to help users neutralize as much as can be privacy-
2525
<p align="center">
2626
Chromium on Linux 64-bit<br>
2727
<img src="https://raw.githubusercontent.com/gorhill/uBlock/master/doc/img/ss-chromium-2.png" /><br><br>
28-
<sup>The screenshots above were taken after visiting links in
29-
<a href="https://github.com/gorhill/uBlock/wiki/Reference-benchmark">reference benchmark</a>
30-
plus a bit of random browsing. All blockers were active at the same time,
31-
thus they had to deal with exactly the same workload. Before the screenshots were
32-
taken, I left the browser idle for many minutes so as to let the browser's
28+
<sup>The screenshots above were taken after visiting links in
29+
<a href="https://github.com/gorhill/uBlock/wiki/Reference-benchmark">reference benchmark</a>
30+
plus a bit of random browsing. All blockers were active at the same time,
31+
thus they had to deal with exactly the same workload. Before the screenshots were
32+
taken, I left the browser idle for many minutes so as to let the browser's
3333
garbage collector kicks in. Also, after a while idling, it's good to open the dev
34-
console for each extension and force a garbage collection cycle by clicking a couple of times
35-
the trashcan icon in the _Timeline_ tab (this caused a ~15MB drop for µBlock and Adguard in Opera)
34+
console for each extension and force a garbage collection cycle by clicking a couple of times
35+
the trashcan icon in the _Timeline_ tab (this caused a ~15MB drop for µBlock and Adguard in Opera)
3636
as garbage collectors sometimes work in a very lazy way, so I did this for each extension.</sup>
3737
</p>
3838

3939
<p align="center">
4040
Being lean doesn't mean blocking less.<br>
4141
<img src="https://raw.githubusercontent.com/gorhill/uBlock/master/doc/benchmarks/privex-201409-30.png" /><br>
42-
<sup>For details of benchmark, see latest
42+
<sup>For details of benchmark, see latest
4343
<a href="https://github.com/gorhill/uBlock/wiki/%C2%B5Block-and-others:-Blocking-ads,-trackers,-malwares">µBlock and others: Blocking ads, trackers, malwares</a>.
4444
</p>
4545

4646
## Installation
4747

48-
From the [Chrome store](https://chrome.google.com/webstore/detail/µblock/cjpalhdlnbpafiamejdnhcphjbkeiagm),
48+
From the [Chrome store](https://chrome.google.com/webstore/detail/µblock/cjpalhdlnbpafiamejdnhcphjbkeiagm),
4949
the [Opera store](https://addons.opera.com/en-gb/extensions/details/ublock/), or [manually](https://github.com/gorhill/uBlock/tree/master/dist#install).
5050

51-
To benefit from the higher efficiency, it is of course not advised to use an
52-
inefficient blocker at the same time. µBlock will do as well or better than the
51+
To benefit from the higher efficiency, it is of course not advised to use an
52+
inefficient blocker at the same time. µBlock will do as well or better than the
5353
popular blockers out there.
5454

5555
Also of interest: [About the required permissions](https://github.com/gorhill/uBlock/wiki/About-the-required-permissions).
@@ -61,8 +61,8 @@ I think it is pretty obvious, except for this I suppose:
6161
![Popup](https://raw.githubusercontent.com/gorhill/uBlock/master/doc/img/popup-1.png)&emsp; ![Popup](https://raw.githubusercontent.com/gorhill/uBlock/master/doc/img/popup-2.png)
6262

6363
The big power button is to disable/enable µBlock **for the specific hostname
64-
which can be extracted from the URL address of the current page**. (It applies to
65-
the current web site only, it is **not** a global power button.) The state of the power
64+
which can be extracted from the URL address of the current page**. (It applies to
65+
the current web site only, it is **not** a global power button.) The state of the power
6666
switch for a specific site will be remembered.
6767

6868
The right-hand screenshot shows optional [dynamic filtering](https://github.com/gorhill/uBlock/wiki/Dynamic-filtering) at work.
@@ -71,22 +71,22 @@ The right-hand screenshot shows optional [dynamic filtering](https://github.com/
7171

7272
µBlock is born out of [HTTP Switchboard](https://github.com/gorhill/httpswitchboard).
7373
All the niceties of HTTPSB have been removed, and what is left is a straightforward
74-
blocker which support EasyList and the likes, and also support host files.
74+
blocker which support EasyList and the likes, and also support host files.
7575
Cosmetic filters ("element hiding") are supported.
7676

7777
There is nothing more to it. But it does what popular blockers out there do, at a
78-
fraction of CPU and memory usage for the same blocking power. Also, no unique user id
78+
fraction of CPU and memory usage for the same blocking power. Also, no unique user id
7979
and no home means no phoning home (some popular blockers do this, just be careful).
8080

8181
Free. Open source. For users by users. No donations sought.
8282

83-
Without the preset lists of filters, this extension is nothing. So if ever you
84-
really do want to contribute something, think about the people working hard
85-
to maintain the filter lists you are using, which were made available to use by
83+
Without the preset lists of filters, this extension is nothing. So if ever you
84+
really do want to contribute something, think about the people working hard
85+
to maintain the filter lists you are using, which were made available to use by
8686
all for free.
8787

88-
You may contribute by helping to translate this project. I created an
89-
[entry on Crowdin](https://crowdin.net/project/ublock), where you may contribute
88+
You may contribute by helping to translate this project. I created an
89+
[entry on Crowdin](https://crowdin.net/project/ublock), where you may contribute
9090
to the translation work.
9191

9292
## License

import-crowdin.sh

-67
This file was deleted.

js/messaging-client.js

-141
This file was deleted.

0 commit comments

Comments
 (0)