Skip to content

Adjust bridge settings semantics for search results

Merge Info

Issues

Resolves

Related

Merging

Target Branches

  • tor-browser - !fixups to tor-browser-specific commits, new features, security backports
  • base-browser and mullvad-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
    • ⚠️ IMPORTANT: Please list the base-browser-specific commits which need to be cherry-picked to the base-browser and mullvad-browser branches here

Target Channels

  • Alpha: esr128-14.5
  • Stable: esr128-14.0
  • Legacy: esr115-13.5

Backporting

Timeline

  • No Backport (preferred): patchset for the next major stable
  • Immediate: patchset needed as soon as possible
  • Next Minor Stable Release: patchset that needs to be verified in nightly before backport
  • Eventually: patchset that needs to be verified in alpha before backport

(Optional) Justification

  • Emergency security update: patchset fixes CVEs, 0-days, etc
  • Censorship event: patchset enables censorship circumvention
  • Critical bug-fix: patchset fixes a bug in core-functionality
  • Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
  • Sponsor required: patchset required for sponsor
  • Localization: typos and other localization changes that should be also in the release branch
  • Other: please explain

Issue Tracking

Review

Request Reviewer

  • Request review from an applications developer depending on modified system:
    • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since Gitlab only allows 1 reviewer)
    • accessibility : henry
    • android : clairehurst, dan
    • build system : boklm
    • extensions : ma1
    • firefox internals (XUL/JS/XPCOM) : jwilde, ma1
    • fonts : pierov
    • frontend (implementation) : henry
    • frontend (review) : donuts, morgan
    • localization : henry, pierov
    • macOS : clairehurst, dan
    • nightly builds : boklm
    • rebases/release-prep : dan, ma1, pierov, morgan
    • security : jwilde, ma1
    • signing : boklm, morgan
    • updater : pierov
    • windows : jwilde, morgan
    • misc/other : pierov, morgan

Change Description

Merge request is split into two commits.

First, we exclude hidden items from search results by using the hidden attribute instead of display: none. The firefox logic for searching only checks for the hidden attribute. We also use data-hidden-from-search to exclude some elements entirely.

Next, we add duplicate headings that only appear in search results. These are shifted by one heading level so that the search result hierarchy remains consistent.

How Tested

Tested by searching for some keywords that should or shouldn't show the bridge or advanced settings. E.g. "bridge", "Tor", "connect", "bridge pass", etc. Only the visible text should be able to match with a search result, so "added by" will only show the bridge settings if you have manually provided bridges.

Only one heading for each pair should be visible at any given moment: either in a search or not.

The re-focusing of headings should work. If you remove all bridges the focus should return to the visible "Bridges" heading (focus is visible if you use keyboard to do this. If you add or edit bridges then the visible "Your bridges" heading will be focused instead. Similarly with the heading shown for Lox bridges when clicking "Got it" to dismiss an event update.

Merge request reports

Loading