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

Stop including the "errorWrapper" HTML code in MOZCENTRAL-builds

Browse Source 
Given that these HTML elements are not being used at all in `MOZCENTRAL`-builds, note the preprocessor check in `PDFViewerApplication._otherError`, we obviously don't need the HTML code either.
This commit is contained in:
Jonas Jenwald 2021-02-14 10:39:34 +01:00
parent c79fd71457
commit 7f8a9b12d9
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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;

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",