Opened 7 months ago

Last modified 5 months ago

#33890 merge_ready defect

Rename .xul to .xhtml

Reported by: acat Owned by: tbb-team
Priority: Medium Milestone:
Component: Applications/Tor Browser Version:
Severity: Normal Keywords: TorBrowserTeam202006R
Cc: tbb-team Actual Points: 0.1
Parent ID: #33533 Points:
Reviewer: Sponsor:

Description

Firefox did a mass rename of all .xul files to .xhtml in https://bugzilla.mozilla.org/show_bug.cgi?id=1579952. We need to do the same in torbutton and tor-launcher, as well as in several Tor Browser patches that involve UI.

Child Tickets

Change History (7)

comment:1 Changed 7 months ago by acat

Keywords: TorBrowserTeam202004R added; TorBrowserTeam202004 removed
Status: newneeds_review

torbutton patch: https://github.com/acatarineu/torbutton/commit/782cc4b27d580c43d3db78690f9ab0803eb854af

tor-launcher patch: https://github.com/acatarineu/tor-launcher/commit/0bd09322f4af1b36e9ee60411a9fae608132d92a

For Tor Browser patches, this is already done in #33533, so perhaps this can be reviewed there.

comment:2 in reply to:  1 ; Changed 7 months ago by mcs

Keywords: TorBrowserTeam202004 added; TorBrowserTeam202004R removed
Status: needs_reviewneeds_revision

Replying to acat:

torbutton patch: https://github.com/acatarineu/torbutton/commit/782cc4b27d580c43d3db78690f9ab0803eb854af

Looks good. Just a couple of things:

  • Please edit the comment in tor-circuit-display.js that refers to "torbutton.xul" to instead point to browser/base/content/browser.xhtml.
  • Is there a ticket that covers general cleanup of torbutton.css and related files? For example, does #tor-button still exist anywhere? Maybe this is covered by #28745?

tor-launcher patch: https://github.com/acatarineu/tor-launcher/commit/0bd09322f4af1b36e9ee60411a9fae608132d92a

In src/install.rdf, please also remove the commented out block with <em:optionsURL>. It has never been used and keeping it causes grep to find a reference to xul.

comment:3 in reply to:  2 ; Changed 7 months ago by acat

Keywords: TorBrowserTeam202004R added; TorBrowserTeam202004 removed
Status: needs_revisionneeds_review

Thanks, revised in

https://github.com/acatarineu/torbutton/commit/3541943d842162641100741cb6b08cb45058038f

and

https://github.com/acatarineu/tor-launcher/commit/de405aee1a4e5c848905b9f52bccc2764cdbb8c7

Replying to mcs:

  • Is there a ticket that covers general cleanup of torbutton.css and related files? For example, does #tor-button still exist anywhere? Maybe this is covered by #28745?

Yes, from the most recent branch in that ticket (28745+5), https://github.com/acatarineu/torbutton/commit/8070594b1eeed499eae5b18980d6d1c363090cf1 should deal with that cleanup.

comment:4 Changed 7 months ago by acat

Actual Points: 0.1

comment:5 in reply to:  3 Changed 6 months ago by mcs

Status: needs_reviewmerge_ready

comment:6 Changed 5 months ago by gk

Keywords: TorBrowserTeam202006R added; TorBrowserTeam202004R removed

Moving to TorBrowserTeam202006R to keep them on our radar.

comment:7 Changed 5 months ago by gk

The tor-launcher change landed on master (commit de405aee1a4e5c848905b9f52bccc2764cdbb8c7).

Note: See TracTickets for help on using tickets.