diff --git a/extensions/firefox/components/PdfStreamConverter.js b/extensions/firefox/components/PdfStreamConverter.js index 0d3bb3ab4..af805185f 100644 --- a/extensions/firefox/components/PdfStreamConverter.js +++ b/extensions/firefox/components/PdfStreamConverter.js @@ -383,6 +383,9 @@ ChromeActions.prototype = { var prefGfx = getBoolPref('gfx.downloadable_fonts.enabled', true); return (!!prefBrowser && prefGfx); }, + supportsDocumentColors: function() { + return getBoolPref('browser.display.use_document_colors', true); + }, fallback: function(url, sendResponse) { var self = this; var domWindow = this.domWindow; diff --git a/l10n/en-US/viewer.properties b/l10n/en-US/viewer.properties index 9255bfc6c..99f4ff305 100644 --- a/l10n/en-US/viewer.properties +++ b/l10n/en-US/viewer.properties @@ -123,3 +123,4 @@ request_password=PDF is protected by a password: printing_not_supported=Warning: Printing is not fully supported by this browser. printing_not_ready=Warning: The PDF is not fully loaded for printing. web_fonts_disabled=Web fonts are disabled: unable to use embedded PDF fonts. +web_colors_disabled=Web colors are disabled. diff --git a/l10n/sv/viewer.properties b/l10n/sv/viewer.properties index d51c451af..b478ec27b 100644 --- a/l10n/sv/viewer.properties +++ b/l10n/sv/viewer.properties @@ -122,4 +122,5 @@ request_password=PDF-filen är lösenordsskyddad: printing_not_supported=Varning: Utskrifter stöds inte fullt ut av denna webbläsare. printing_not_ready=Varning: Hela PDF-filen måste laddas innan utskrift kan ske. -web_fonts_disabled=Webbtypsnitt är inaktiverade: Typsnitt inkluderade i PDF-filer kan ej användas. +web_fonts_disabled=Webbtypsnitt är inaktiverade: Typsnitt inbäddade i PDF-filer kan ej användas. +web_colors_disabled=Webbfärger är inaktiverade. diff --git a/web/viewer.js b/web/viewer.js index 2204870fd..7fc0e670c 100644 --- a/web/viewer.js +++ b/web/viewer.js @@ -922,6 +922,19 @@ var PDFView = { return support; }, + get supportsDocumentColors() { + var support = true; +//#if !(FIREFOX || MOZCENTRAL) +//#else +// support = FirefoxCom.requestSync('supportsDocumentColors'); +//#endif + Object.defineProperty(this, 'supportsDocumentColors', { value: support, + enumerable: true, + configurable: true, + writable: false }); + return support; + }, + get isHorizontalScrollbarEnabled() { var div = document.getElementById('viewerContainer'); return div.scrollWidth > div.clientWidth; @@ -2263,6 +2276,12 @@ var PageView = function pageView(container, id, scale, // 'Web fonts are disabled: unable to use embedded PDF fonts.')); // PDFView.fallback(); // } +// if (self.textLayer && self.textLayer.textDivs.length && +// !PDFView.supportsDocumentColors) { +// console.error(mozL10n.get('web_colors_disabled', null, +// 'Web colors are disabled.')); +// PDFView.fallback(); +// } //#endif if (error) { PDFView.error(mozL10n.get('rendering_error', null,