Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add no scripting feature #263

Merged
merged 2 commits into from
Oct 26, 2020
Merged

Add no scripting feature #263

merged 2 commits into from
Oct 26, 2020

Conversation

hawkeye116477
Copy link
Contributor

Fixes #95

…es#155

<gorhill#95>: a new per-site switch
has been added, no-scripting, which purpose is to wholly disable/enable
javascript for a given site. This new switch has precedence over all
other ways javascript can be disabled, including precedence over dynamic
filtering rules.

The popup panel will report the number of script resources which have
been seen by uBO for the current page. There is a minor inaccuracy to
be fixed regarding the count, and which fix requires to extend request
journaling.

<gorhill/uBlock#308>: the `noscript` tags will
now be respected when the new no-scripting switch is in effect on a given
site.

A default setting has been added to the _Settings_ pane to
disable/enable globally the new no-script switch, such that one can
work in default-deny mode regarding javascript execution.

<uBlockOrigin/uBlock-issues#155>: a new
hidden setting, `requestJournalProcessPeriod`, has been added to
allow controlling the delay before uBO internally process it's
network request journal queue. Default to 1000 (milliseconds).

Co-authored-by:  gorhill <585534+gorhill@users.noreply.github.com>
@JustOff
Copy link
Collaborator

JustOff commented Oct 9, 2020

Given this adds three new entities to src/_locales/en/messages.json, please include here only related changes to the other locales, and split out the general update of upstream translations into a separate PR.

This will allow us to manage the sources more accurately in case something goes wrong with this particular PR.

@hawkeye116477
Copy link
Contributor Author

hawkeye116477 commented Oct 9, 2020

Ok.

@JustOff
Copy link
Collaborator

JustOff commented Oct 9, 2020

I would ask you, if possible, not to make the update of locales from upstream a pre-requisite to the rest of the PRs and leave it for later. The main issue with translations is that I would not want to update them without a detailed study of the changes in the original strings and probably the help of the translators.

@hawkeye116477
Copy link
Contributor Author

10e48b4 contains only new added strings, the rest is „pretty print".

I'm not sure if I understand, do you want only English strings or just not update not related strings with changes?

@JustOff
Copy link
Collaborator

JustOff commented Oct 9, 2020

Let's make „pretty print" someday later in a separate PR/commit.

For your convenience, here is the locales update you need for this PR: JustOff@7be99da.

@hawkeye116477
Copy link
Contributor Author

Ok, I'll remember this, added.

@JustOff
Copy link
Collaborator

JustOff commented Oct 10, 2020

Sorry, I messed up with JustOff@7be99da, now fixed in 004f83b.

@JustOff
Copy link
Collaborator

JustOff commented Oct 10, 2020

Here is the beta version to test: uBlock0_1.16.4.26b9.firefox-legacy.xpi.zip, I just put it in my main profile.

It also includes already verified and merged PRs #264, #265, #266, #267, #268, #269 and #270.

Ping @THEtomaso.

@hawkeye116477
Copy link
Contributor Author

hawkeye116477 commented Oct 11, 2020

Shouldn't that be now 1.16.5 or maybe 1.17.0?

Anyway, this is not the end of what I want to share. After you merge that, I'll send 2 PRs yet, which I couldn't send now without causing conflicts.

@hawkeye116477
Copy link
Contributor Author

@THEtomaso So everything is all right with this?

@THEtomaso
Copy link

I fiddled around with it a bit, after first installing v1.16.4.26b9..
At first, I wasn't sure if its enabled/disabled state interacted correctly with uBO's "My rules" window.
..but after comparing it with uBO's main branch, I'd say that it works like intended! 👍

@JustOff
Copy link
Collaborator

JustOff commented Oct 22, 2020

Sorry for not being very active here, I've been a bit short of time recently. I'll try to get the release ready by the end of the week.

@JustOff JustOff merged commit b84c469 into gorhill:master Oct 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Missing feature: No scripting
3 participants