Don't handle events from submenus in GM_{show,hide}Popup.

Fixes greasemonkey#1762.
Ventero · Jul 13, 2013 · 8073f86 · 8073f86
1 parent a89695c
commit 8073f86
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/content/browser.js b/content/browser.js
@@ -327,6 +327,10 @@ function GM_showPopup(aEvent) {
     return mi;
   }
 
+  // Make sure this event was triggered by opening the actual monkey menu,
+  // not one of its submenus.
+  if (aEvent.currentTarget != aEvent.target) return;
+
   var popup = aEvent.target;
   var scriptsFramedEl = popup.getElementsByClassName("scripts-framed-point")[0];
   var scriptsTopEl = popup.getElementsByClassName("scripts-top-point")[0];
@@ -383,7 +387,8 @@ function GM_showPopup(aEvent) {
  */
 function GM_hidePopup(aEvent) {
   var popup = aEvent.target;
-
+  // Only handle the actual monkey menu event.
+  if (aEvent.currentTarget != aEvent.target) return;
   // Propagate to commands sub-menu.
   var commandsPopup = popup.querySelector(
       'menupopup.greasemonkey-user-script-commands-popup');

diff --git a/content/browser.xul b/content/browser.xul
@@ -97,11 +97,7 @@
         accesskey="&menu.commands.accesskey;"
         label="&menu.commands;"
       >
-        <menupopup
-          class='greasemonkey-user-script-commands-popup'
-          onpopupshowing="event.stopPropagation();"
-          onpopuphiding="event.stopPropagation();"
-          />
+        <menupopup class='greasemonkey-user-script-commands-popup' />
       </menu>
 
       <menuseparator />