From 5d67183b4d251d929752b2b39377c94fd7f9c07f Mon Sep 17 00:00:00 2001 From: Brendan Dahl Date: Wed, 23 May 2012 16:54:55 -0700 Subject: [PATCH] Fix notification from showing up in wrong window. --- .../firefox/components/PdfStreamConverter.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/extensions/firefox/components/PdfStreamConverter.js b/extensions/firefox/components/PdfStreamConverter.js index d4a375ccc..550fbf271 100644 --- a/extensions/firefox/components/PdfStreamConverter.js +++ b/extensions/firefox/components/PdfStreamConverter.js @@ -100,7 +100,8 @@ function getLocalizedString(strings, id) { } // All the priviledged actions. -function ChromeActions() { +function ChromeActions(domWindow) { + this.domWindow = domWindow; } ChromeActions.prototype = { @@ -170,11 +171,15 @@ ChromeActions.prototype = { return getBoolPref(EXT_PREFIX + '.pdfBugEnabled', false); }, fallback: function(url) { - var strings = getLocalizedStrings('chrome.properties'); var self = this; + var domWindow = this.domWindow; + var strings = getLocalizedStrings('chrome.properties'); var message = getLocalizedString(strings, 'unsupported_feature'); + var win = Services.wm.getMostRecentWindow('navigator:browser'); - var notificationBox = win.gBrowser.getNotificationBox(); + var browser = win.gBrowser.getBrowserForDocument(domWindow.top.document); + var notificationBox = win.gBrowser.getNotificationBox(browser); + var buttons = [{ label: getLocalizedString(strings, 'open_with_different_viewer'), accessKey: null, @@ -290,7 +295,8 @@ PdfStreamConverter.prototype = { var domWindow = getDOMWindow(channel); // Double check the url is still the correct one. if (domWindow.document.documentURIObject.equals(aRequest.URI)) { - let requestListener = new RequestListener(new ChromeActions); + let requestListener = new RequestListener( + new ChromeActions(domWindow)); domWindow.addEventListener(PDFJS_EVENT_ID, function(event) { requestListener.receive(event); }, false, true);