Bug 335586, r=mconnor+neil

toolkit/content/widgets/browser.xml

@@ -594,7 +594,7 @@
           // Listen for first load for lazy attachment to form fill controller
           this.addEventListener("pageshow", this.onPageShow, true);
           this.addEventListener("pagehide", this.onPageHide, true);
-          this.addEventListener("DOMPopupBlocked", this.onPopupBlocked, false);
+          this.addEventListener("DOMPopupBlocked", this.onPopupBlocked, true);
         ]]>
       </constructor>
       

xpfe/browser/resources/content/navigator.js

@@ -688,8 +688,8 @@ function Startup()
   // initiated by a web page script
   addEventListener("fullscreen", onFullScreen, false);
 
-  addEventListener("PopupWindow", onPopupWindow, false);
-  addEventListener("DOMPopupBlocked", onPopupBlocked, false);
+  addEventListener("PopupWindow", onPopupWindow, true);
+  addEventListener("DOMPopupBlocked", onPopupBlocked, true);
 
   // does clicking on the urlbar select its contents?
   gClickSelectsAll = pref.getBoolPref("browser.urlbar.clickSelectsAll");