Backed out changeset 6de16b8f63dc (bug 1388832) for failing browser-chrome's browser/components/customizableui/test/browser_customization_context_menus.js. r=backout

This commit is contained in:
Sebastian Hengst 2017-09-20 20:45:48 +02:00
parent 6a2a97d0b6
commit 44b3c4e92b
2 changed files with 11 additions and 4 deletions

View File

@ -5428,8 +5428,15 @@ function onViewToolbarsPopupShowing(aEvent, aInsertPoint) {
if (toolbarItem && toolbarItem.localName == "toolbarpaletteitem") {
toolbarItem = toolbarItem.firstChild;
} else if (toolbarItem && toolbarItem.localName != "toolbar") {
toolbarItem = toolbarItem.closest(
".customization-target, [overflowfortoolbar], toolbarpaletteitem, toolbar");
while (toolbarItem && toolbarItem.parentNode) {
let parent = toolbarItem.parentNode;
if ((parent.classList && parent.classList.contains("customization-target")) ||
parent.getAttribute("overflowfortoolbar") || // Needs to work in the overflow list as well.
parent.localName == "toolbarpaletteitem" ||
parent.localName == "toolbar")
break;
toolbarItem = parent;
}
} else {
toolbarItem = null;
}

View File

@ -1622,8 +1622,8 @@ toolbarpaletteitem[place="palette"] > .toolbarbutton-1 > .toolbarbutton-menubutt
}
#search-container[cui-areatype="menu-panel"] {
padding-top: 6px;
padding-bottom: 6px;
margin-top: 6px;
margin-bottom: 6px;
}
toolbarpaletteitem[place="palette"] > #search-container {