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

Merge pull request #12991 from Snuffleupagus/viewer-Firefox-rm-misc-code

Browse Source 
Stop including unused/unnecessary code in the viewer, for `MOZCENTRAL`-builds
This commit is contained in:
Tim van der Meij 2021-02-14 15:17:16 +01:00 committed by GitHub
commit f892c00275
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
web/app.js
View File

@ -824,8 +824,10 @@ const PDFViewerApplication = {
async close() { async close() {
this._unblockDocumentLoadEvent(); this._unblockDocumentLoadEvent();
const errorWrapper = this.appConfig.errorWrapper.container; if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")) {
errorWrapper.hidden = true; const { container } = this.appConfig.errorWrapper;
container.hidden = true;
}
if (!this.pdfLoadingTask) { if (!this.pdfLoadingTask) {
return undefined; return undefined;
@ -1421,7 +1423,10 @@ const PDFViewerApplication = {
pdfViewer.optionalContentConfigPromise.then(optionalContentConfig => { pdfViewer.optionalContentConfigPromise.then(optionalContentConfig => {
this.pdfLayerViewer.render({ optionalContentConfig, pdfDocument }); this.pdfLayerViewer.render({ optionalContentConfig, pdfDocument });
}); });
if ("requestIdleCallback" in window) { if (
(typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) ||
"requestIdleCallback" in window
) {
const callback = window.requestIdleCallback( const callback = window.requestIdleCallback(
() => { () => {
this._collectTelemetry(pdfDocument); this._collectTelemetry(pdfDocument);

2
web/pdf_cursor_tools.js
View File

@ -129,8 +129,6 @@ class PDFCursorTools {
this.eventBus._on("presentationmodechanged", evt => { this.eventBus._on("presentationmodechanged", evt => {
switch (evt.state) { switch (evt.state) {
case PresentationModeState.CHANGING:
break;
case PresentationModeState.FULLSCREEN: { case PresentationModeState.FULLSCREEN: {
const previouslyActive = this.active; const previouslyActive = this.active;

2
web/viewer.html
View File

@ -320,6 +320,7 @@ See https://github.com/adobe-type-tools/cmap-resources
<div id="viewer" class="pdfViewer"></div> <div id="viewer" class="pdfViewer"></div>
</div> </div>
<!--#if !MOZCENTRAL-->
<div id="errorWrapper" hidden='true'> <div id="errorWrapper" hidden='true'>
<div id="errorMessageLeft"> <div id="errorMessageLeft">
<span id="errorMessage"></span> <span id="errorMessage"></span>
@ -338,6 +339,7 @@ See https://github.com/adobe-type-tools/cmap-resources
<div class="clearBoth"></div> <div class="clearBoth"></div>
<textarea id="errorMoreInfo" hidden='true' readonly="readonly"></textarea> <textarea id="errorMoreInfo" hidden='true' readonly="readonly"></textarea>
</div> </div>
<!--#endif-->
</div> <!-- mainContainer --> </div> <!-- mainContainer -->
<div id="overlayContainer" class="hidden"> <div id="overlayContainer" class="hidden">

21
web/viewer.js
View File

@ -61,6 +61,18 @@ if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("CHROME || GENERIC")) {
} }
function getViewerConfiguration() { function getViewerConfiguration() {
let errorWrapper = null;
if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")) {
errorWrapper = {
container: document.getElementById("errorWrapper"),
errorMessage: document.getElementById("errorMessage"),
closeButton: document.getElementById("errorClose"),
errorMoreInfo: document.getElementById("errorMoreInfo"),
moreInfoButton: document.getElementById("errorShowMore"),
lessInfoButton: document.getElementById("errorShowLess"),
};
}
return { return {
appContainer: document.body, appContainer: document.body,
mainContainer: document.getElementById("viewerContainer"), mainContainer: document.getElementById("viewerContainer"),
@ -177,14 +189,7 @@ function getViewerConfiguration() {
linearized: document.getElementById("linearizedField"), linearized: document.getElementById("linearizedField"),
}, },
}, },
errorWrapper: { errorWrapper,
container: document.getElementById("errorWrapper"),
errorMessage: document.getElementById("errorMessage"),
closeButton: document.getElementById("errorClose"),
errorMoreInfo: document.getElementById("errorMoreInfo"),
moreInfoButton: document.getElementById("errorShowMore"),
lessInfoButton: document.getElementById("errorShowLess"),
},
printContainer: document.getElementById("printContainer"), printContainer: document.getElementById("printContainer"),
openFileInputName: "fileInput", openFileInputName: "fileInput",
debuggerScriptPath: "./debugger.js", debuggerScriptPath: "./debugger.js",