Skip to content

Commit f88ce30

Browse files
committed
Bug 1864957 - remove the extra <panel> Report Broken Site was using as a work-around for bug 1866503; r=Gijs,desktop-theme-reviewers,dao
Differential Revision: https://phabricator.services.mozilla.com/D196121
1 parent e70b5a9 commit f88ce30

File tree

3 files changed

+6
-21
lines changed

3 files changed

+6
-21
lines changed

browser/components/reportbrokensite/ReportBrokenSite.sys.mjs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -700,11 +700,9 @@ export var ReportBrokenSite = new (class ReportBrokenSite {
700700
const appMenuPopup = document.getElementById("appMenu-popup");
701701
appMenuPopup?.hidePopup();
702702

703-
// See bug 1864957; we should be able to use showSubView here
704-
ownerGlobal.PanelMultiView.openPopup(
705-
document.getElementById("report-broken-main-menu-panel"),
706-
document.getElementById("PanelUI-menu-button"),
707-
{ position: "bottomright topright" }
703+
ownerGlobal.PanelUI.showSubView(
704+
ReportBrokenSite.MAIN_PANELVIEW_ID,
705+
ownerGlobal.PanelUI.menuButton
708706
);
709707
break;
710708
}

browser/components/reportbrokensite/content/reportBrokenSitePanel.inc.xhtml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,15 @@
22
- License, v. 2.0. If a copy of the MPL was not distributed with this
33
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
44

5-
<panel id="report-broken-main-menu-panel"
6-
class="cui-widget-panel panel-no-padding"
7-
type="arrow"
8-
role="alertdialog"
9-
aria-labelledby="report-broken-site-panel-intro"
10-
noautofocus="true"
11-
tabspecific="true"
12-
flip="slide"
13-
orient="vertical">
14-
<panelmultiview mainViewId="report-broken-site-popup-mainView"/>
15-
</panel>
16-
175
<panelview id="report-broken-site-popup-mainView"
186
class="report-broken-site-view main-view PanelUI-subView"
197
role="document"
208
data-l10n-id="report-broken-site-panel-header"
219
data-l10n-attrs="title"
2210
hidden="true"
2311
showheader="true">
24-
<!-- Once bug 1864957 is fixed, the wants-back-button attribute here
25-
should probably be removed, as well as in PanelMultiView.sys.mjs.
12+
<!-- wants-back-button will be removed in bug 1869574
13+
(and also from PanelMultiView.sys.mjs)
2614
-->
2715
<box class="panel-header" wants-back-button="true">
2816
<html:h1 role="heading" aria-level="1">

browser/themes/shared/customizableui/panelUI-shared.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,8 +433,7 @@ panelview[id^=PanelUI-webext-] {
433433
/* The Report Broken Site panel can be opened from the Help menu
434434
* in the menubar, which isn't a descendant of #appMenu-popup.
435435
* Target it specifically in this rule to make it the same width
436-
* as if it was a standard panelview opened from the app menu.
437-
* This hack should probably be removed once bug 1864957 is fixed. */
436+
* as if it was a standard panelview opened from the app menu. */
438437
#report-broken-site-popup-mainView[mainview],
439438
#PanelUI-fxa {
440439
width: 22.5em;

0 commit comments

Comments
 (0)