Remove script command items when the monkey menu closes to prevent zo…

…mbie compartments. Refs greasemonkey#1578
arantius · Aug 1, 2012 · 2a09200 · 2a09200
1 parent 928920c
commit 2a09200
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/content/browser.js b/content/browser.js
@@ -335,6 +335,15 @@ function GM_showPopup(aEvent) {
   GM_MenuCommander.onPopupShowing(menuCommandPopup);
 }
 
+/**
+ * Clean up the menu after it hides to prevent memory leaks
+ */
+function GM_hidePopup(aEvent) {
+  var popup = aEvent.target;
+
+  var menuCommandPopup = popup.getElementsByTagName('menupopup')[0];
+  if(menuCommandPopup) GM_util.emptyEl(menuCommandPopup);
+}
 
 // Short-term workaround for #1406: Tab Mix Plus breaks opening links in
 // new tabs because it depends on this function, and incorrectly checks for

diff --git a/content/browser.xul b/content/browser.xul
@@ -52,6 +52,7 @@
   >
     <menupopup
       onpopupshowing="GM_showPopup(event);"
+      onpopuphiding="GM_hidePopup(event);"
       onclick="GM_popupClicked(event);event.stopPropagation();"
       oncommand="GM_popupClicked(event);event.stopPropagation();"
       oncontextmenu="event.preventDefault();"