Merge pull request #15432 from Snuffleupagus/validateFileURL-var
Some *small* viewer clean-up for non-GENERIC builds
This commit is contained in:
commit
f7ab417757
@ -2179,14 +2179,14 @@ const PDFViewerApplication = {
|
||||
},
|
||||
};
|
||||
|
||||
let validateFileURL;
|
||||
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
|
||||
const HOSTED_VIEWER_ORIGINS = [
|
||||
"null",
|
||||
"http://mozilla.github.io",
|
||||
"https://mozilla.github.io",
|
||||
];
|
||||
validateFileURL = function (file) {
|
||||
// eslint-disable-next-line no-var
|
||||
var validateFileURL = function (file) {
|
||||
if (!file) {
|
||||
return;
|
||||
}
|
||||
|
@ -69,18 +69,6 @@ if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("CHROME || GENERIC")) {
|
||||
}
|
||||
|
||||
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 {
|
||||
appContainer: document.body,
|
||||
mainContainer: document.getElementById("viewerContainer"),
|
||||
@ -207,7 +195,17 @@ function getViewerConfiguration() {
|
||||
editorInkThickness: document.getElementById("editorInkThickness"),
|
||||
editorInkOpacity: document.getElementById("editorInkOpacity"),
|
||||
},
|
||||
errorWrapper,
|
||||
errorWrapper:
|
||||
typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")
|
||||
? {
|
||||
container: document.getElementById("errorWrapper"),
|
||||
errorMessage: document.getElementById("errorMessage"),
|
||||
closeButton: document.getElementById("errorClose"),
|
||||
errorMoreInfo: document.getElementById("errorMoreInfo"),
|
||||
moreInfoButton: document.getElementById("errorShowMore"),
|
||||
lessInfoButton: document.getElementById("errorShowLess"),
|
||||
}
|
||||
: null,
|
||||
printContainer: document.getElementById("printContainer"),
|
||||
openFileInput:
|
||||
typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")
|
||||
|
Loading…
Reference in New Issue
Block a user