From 4da3783e5266149836801b941643de836218086f Mon Sep 17 00:00:00 2001 From: Bill McCloskey Date: Wed, 16 Jul 2014 23:05:17 -0700 Subject: [PATCH] Bug 1024391 - Fix popup blocking bug (r=felipe) --- browser/base/content/browser.js | 2 +- browser/base/content/tabbrowser.xml | 2 +- toolkit/content/widgets/browser.xml | 21 ++++++++++++--------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 638792a96956..0523fb499577 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -540,7 +540,7 @@ var gPopupBlockerObserver = { // xxxdz this should make the option say "Show file picker" and do it (Bug 590306) if (!blockedPopup.popupWindowURI) continue; - var popupURIspec = blockedPopup.popupWindowURI; + var popupURIspec = blockedPopup.popupWindowURI.spec; // Sometimes the popup URI that we get back from the blockedPopup // isn't useful (for instance, netscape.com's popup URI ends up diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index 61ec4d7cf40e..7598b13e07de 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -1024,7 +1024,7 @@ this._appendStatusPanel(); if (updateBlockedPopups) - this.mCurrentBrowser.updateBlockedPopups(false); + this.mCurrentBrowser.updateBlockedPopups(); // Update the URL bar. var loc = this.mCurrentBrowser.currentURI; diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml index c1fa6575ba2c..0e744c157caf 100644 --- a/toolkit/content/widgets/browser.xml +++ b/toolkit/content/widgets/browser.xml @@ -595,15 +595,8 @@ - -