Bug 1354071 - make sure context menu continues to work correctly, r?mikedeboer draft
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Wed, 19 Apr 2017 11:21:12 +0100
changeset 565114 e4ba7dafb61176002fb35fbbb49c5950c72e441b
parent 564214 8602e7d8ae617f6cbd264760b0178afd5a1807bb
child 565115 26a9779bcf39b54a35f0c6c061fc0010426b3bc2
child 565776 66d30a22e87e7446680376fd5fb3a561d73bc175
push id54795
push userbmo:gijskruitbosch+bugs@gmail.com
push dateWed, 19 Apr 2017 15:04:17 +0000
reviewersmikedeboer
bugs1354071
milestone55.0a1
Bug 1354071 - make sure context menu continues to work correctly, r?mikedeboer MozReview-Commit-ID: DZiwogYyDBv
browser/components/customizableui/CustomizableUI.jsm
browser/components/customizableui/content/panelUI.inc.xul
--- a/browser/components/customizableui/CustomizableUI.jsm
+++ b/browser/components/customizableui/CustomizableUI.jsm
@@ -4114,17 +4114,19 @@ OverflowableToolbar.prototype = {
 
   show() {
     if (this._panel.state == "open") {
       return Promise.resolve();
     }
     return new Promise(resolve => {
       let doc = this._panel.ownerDocument;
       this._panel.hidden = false;
-      let contextMenu = doc.getElementById(this._panel.getAttribute("context"));
+      let mainViewId = this._panel.querySelector("panelmultiview").getAttribute("mainViewId");
+      let mainView = doc.getElementById(mainViewId);
+      let contextMenu = doc.getElementById(mainView.getAttribute("context"));
       gELS.addSystemEventListener(contextMenu, "command", this, true);
       let anchor = doc.getAnonymousElementByAttribute(this._chevron, "class", "toolbarbutton-icon");
       this._panel.openPopup(anchor || this._chevron);
       this._chevron.open = true;
 
       let overflowableToolbarInstance = this;
       this._panel.addEventListener("popupshown", function(aEvent) {
         this.addEventListener("dragover", overflowableToolbarInstance);
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -372,21 +372,21 @@
               label="&customizeMenu.addMoreItems.label;"/>
   </menupopup>
 </panel>
 
 <panel id="widget-overflow"
        role="group"
        type="arrow"
        noautofocus="true"
-       context="toolbar-context-menu"
        position="bottomcenter topright"
        hidden="true">
   <panelmultiview mainViewId="widget-overflow-mainView">
-    <panelview id="widget-overflow-mainView">
+    <panelview id="widget-overflow-mainView"
+               context="toolbar-context-menu">
       <vbox id="widget-overflow-scroller">
         <vbox id="widget-overflow-list" class="widget-overflow-list"
               overflowfortoolbar="nav-bar"/>
       </vbox>
     </panelview>
   </panelmultiview>
 </panel>