Merge remote-tracking branch 'janekptacijarabaci/synchronizationBetwe…

…enPopups' Fixes #2276
greasemonkey · Sep 24, 2015 · 8a7d0c1 · 8a7d0c1
2 parents 72020a9 + 28d72d8
commit 8a7d0c1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/content/browser.js b/content/browser.js
@@ -283,19 +283,22 @@ function GM_showPopup(aEvent) {
 
   var mm = getBrowser().mCurrentBrowser.frameLoader.messageManager;
 
+  // See #2276
+  var aEventTarget = aEvent.target;
+
   var callback = null;
   callback = function(message) {
     mm.removeMessageListener("greasemonkey:frame-urls", callback);
 
     var urls = message.data.urls;
-    asyncShowPopup(aEvent, urls);
+    asyncShowPopup(aEventTarget, urls);
   };
 
   mm.addMessageListener("greasemonkey:frame-urls", callback);
   mm.sendAsyncMessage("greasemonkey:frame-urls", {});
 }
 
-function asyncShowPopup(aEvent, urls) {
+function asyncShowPopup(aEventTarget, urls) {
   function uniq(a) {
     var seen = {}, list = [], item;
     for (var i = 0; i < a.length; i++) {
@@ -327,7 +330,7 @@ function asyncShowPopup(aEvent, urls) {
     return mi;
   }
 
-  var popup = aEvent.target;
+  var popup = aEventTarget;
   var scriptsFramedEl = popup.getElementsByClassName("scripts-framed-point")[0];
   var scriptsTopEl = popup.getElementsByClassName("scripts-top-point")[0];
   var scriptsSepEl = popup.getElementsByClassName("scripts-sep")[0];
@@ -374,7 +377,7 @@ function asyncShowPopup(aEvent, urls) {
       function(script) { point = appendScriptAfter(script, point); });
 
   // Propagate to commands sub-menu.
-  GM_MenuCommander.onPopupShowing(aEvent);
+  GM_MenuCommander.onPopupShowing(aEventTarget);
 }
 
 /**

diff --git a/content/menucommander.js b/content/menucommander.js
@@ -43,12 +43,14 @@ GM_MenuCommander.createMenuItem = function(command) {
 GM_MenuCommander.messageMenuCommandResponse = function(aMessage) {
   if (aMessage.data.cookie != GM_MenuCommander.cookieShowing) return;
 
-  GM_MenuCommander.popup.parentNode.disabled = false;
   for (i in aMessage.data.commands) {
     var command = aMessage.data.commands[i];
     var menuItem = GM_MenuCommander.createMenuItem(command);
     GM_MenuCommander.popup.appendChild(menuItem);
   }
+  if (GM_MenuCommander.popup.firstChild) {
+    GM_MenuCommander.popup.parentNode.disabled = false;
+  }
 };
 
 
@@ -58,11 +60,9 @@ GM_MenuCommander.onPopupHiding = function() {
 };
 
 
-GM_MenuCommander.onPopupShowing = function(aEvent) {
-  if (!GM_MenuCommander.popup) {
-    GM_MenuCommander.popup = aEvent.target.querySelector(
-        'menupopup.greasemonkey-user-script-commands-popup');
-  }
+GM_MenuCommander.onPopupShowing = function(aEventTarget) {
+  GM_MenuCommander.popup = aEventTarget.querySelector(
+      'menupopup.greasemonkey-user-script-commands-popup');
 
   GM_MenuCommander.messageCookie++;
   GM_MenuCommander.cookieShowing = GM_MenuCommander.messageCookie;