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

Fixes site settings JS page. #7571

Merged
merged 1 commit into from
Jan 13, 2021
Merged

Fixes site settings JS page. #7571

merged 1 commit into from
Jan 13, 2021

Conversation

mkarolin
Copy link
Collaborator

@mkarolin mkarolin commented Jan 12, 2021

Fixes brave/brave-browser#13271

Adjusted a patch to hide only the toggle on the page, but not the exceptions.

Submitter Checklist:

  • There is a ticket for my issue.
  • Used Github auto-closing keywords in the commit message.
  • Wrote a good PR/commit description
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed).
  • Requested a security/privacy review as needed.

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

Fixes brave/brave-browser#13271

Adjusted a patch to hide only the recommended toggle on the page, but
not the exceptions.
@mkarolin mkarolin requested a review from petemill January 12, 2021 17:01
@mkarolin mkarolin requested a review from a team as a code owner January 12, 2021 17:01
@mkarolin mkarolin self-assigned this Jan 12, 2021
Copy link
Member

@petemill petemill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just moving the </if> higher up so looks good to me!

@mkarolin mkarolin merged commit d67379b into master Jan 13, 2021
@mkarolin mkarolin deleted the maxk-fix-js-settings-page branch January 13, 2021 01:11
@mkarolin mkarolin added this to the 1.20.x - Nightly milestone Jan 13, 2021
mkarolin added a commit that referenced this pull request Jan 13, 2021
@kjozwiak
Copy link
Member

Verification PASSED on Win 10 x64 using the following build:

Brave | 1.20.77 Chromium: 88.0.4324.79 (Official Build) nightly (64-bit)
-- | --
Revision | bd1e9353659b2491dac971226a973ca3b5684a14-refs/branch-heads/4324@{#1520}
OS | Windows 10 OS Version 2009 (Build 19042.746)
  • ensured that Block & Allow are appearing under brave://settings/content/javascript
  • ensured that enabling Scripts blocking via shields correctly adds the website into Blocked
  • ensured that you can remove a website from Blocked which should also disable Scripts blocking for that site
    • ensured that the website loads after being removed from Blocked
    • ensured that the website loads when added into Allow

image

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.

CR88- Javascript content block is empty in brave://settings/content/javascript
4 participants