Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2020-06-20 06:47:51 +08:00
commit ab4f78f4b7
46 changed files with 1004 additions and 604 deletions

View file

@ -4600,6 +4600,12 @@ function onViewToolbarsPopupShowing(aEvent, aInsertPoint) {
toolbarNodes.push(document.getElementById("addon-bar"));
for (let toolbar of toolbarNodes) {
#ifdef MOZ_WIDGET_GTK
if (toolbar.id == "toolbar-menubar" &&
document.documentElement.getAttribute("shellshowingmenubar") == "true") {
continue;
}
#endif
let toolbarName = toolbar.getAttribute("toolbarname");
if (toolbarName) {
let menuItem = document.createElement("menuitem");