Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Addon] Catch errors in getFindBar (in PdfStreamConverter.jsm) to fix loading of PDF files in the bookmark sidebar (bug 1248959)

Browse Source 
Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1248959.
This commit is contained in:
Jonas Jenwald 2016-02-18 13:59:18 +01:00
parent 8cdb69634f
commit f64113c927
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/firefox/content/PdfStreamConverter.jsm
View File

@ -82,9 +82,15 @@ function getFindBar(domWindow) {
//#endif //#endif
return tabbrowser.getFindBar(tab); return tabbrowser.getFindBar(tab);
} catch (e) { } catch (e) {
// FF22 has no _getTabForBrowser, and FF24 has no getFindBar try {
var chromeWindow = browser.ownerDocument.defaultView; // FF22 has no _getTabForBrowser, and FF24 has no getFindBar
return chromeWindow.gFindBar; var chromeWindow = browser.ownerDocument.defaultView;
return chromeWindow.gFindBar;
} catch (ex) {
// Suppress errors for PDF files opened in the bookmark sidebar, see
// https://bugzilla.mozilla.org/show_bug.cgi?id=1248959.
return null;
}
} }
} }
@ -407,7 +413,7 @@ ChromeActions.prototype = {
// ... or when the new find events code exists. // ... or when the new find events code exists.
var findBar = getFindBar(this.domWindow); var findBar = getFindBar(this.domWindow);
return findBar && ('updateControlState' in findBar); return !!findBar && ('updateControlState' in findBar);
}, },
supportsDocumentFonts: function() { supportsDocumentFonts: function() {
var prefBrowser = getIntPref('browser.display.use_document_fonts', 1); var prefBrowser = getIntPref('browser.display.use_document_fonts', 1);