ZenBrowserMirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/zen-browser/pdf.js.git synced 2025-07-10 02:05:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[GENERIC viewer] Re-factor the fileInput initialization

Browse source 
*This is yet another installment in a never-ending series of patches that attempt to simplify and improve old code.*

The `fileInput`-element is used to support the "Open file"-button in the `GENERIC` viewer, however this is very old code.
Rather than creating the element dynamically in JavaScript, we can simply define it conditionally in the HTML code thanks to the pre-processor. Furthermore, the `fileInput`-element currently has a number of unnecessary CSS rules, since the element is *purposely* never made visibly.

Note that with these changes, the `fileInput`-element will now *always* have `display: none;` set. This shouldn't matter, since we can still trigger the `click`-event of the element just fine (via JavaScript) and this patch has been successfully tested in both Mozilla Firefox and Google Chrome.
This commit is contained in:
Jonas Jenwald 2022-04-09 16:30:02 +02:00
parent 2b673a6941
commit 5390d2b377
4 changed files with 17 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

24
web/app.js
View file

@ -2142,7 +2142,7 @@ function reportPageStatsPDFBug({ pageNumber }) {
}
function webViewerInitialized() {
const appConfig = PDFViewerApplication.appConfig;
const { appConfig, eventBus } = PDFViewerApplication;
let file;
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
const queryString = document.location.search.substring(1);
@ -2156,13 +2156,7 @@ function webViewerInitialized() {
}
if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
const fileInput = document.createElement("input");
fileInput.id = appConfig.openFileInputName;
fileInput.className = "fileInput";
fileInput.setAttribute("type", "file");
fileInput.oncontextmenu = noContextMenuHandler;
document.body.appendChild(fileInput);
const fileInput = appConfig.openFileInput;
if (
!window.File ||
!window.FileReader ||
@ -2176,11 +2170,11 @@ function webViewerInitialized() {
}
fileInput.addEventListener("change", function (evt) {
const files = evt.target.files;
const { files } = evt.target;
if (!files || files.length === 0) {
return;
}
PDFViewerApplication.eventBus.dispatch("fileinputchange", {
eventBus.dispatch("fileinputchange", {
source: this,
fileInput: evt.target,
});
@ -2195,11 +2189,11 @@ function webViewerInitialized() {
appConfig.mainContainer.addEventListener("drop", function (evt) {
evt.preventDefault();
const files = evt.dataTransfer.files;
const { files } = evt.dataTransfer;
if (!files || files.length === 0) {
return;
}
PDFViewerApplication.eventBus.dispatch("fileinputchange", {
eventBus.dispatch("fileinputchange", {
source: this,
fileInput: evt.dataTransfer,
});
@ -2234,7 +2228,7 @@ function webViewerInitialized() {
"transitionend",
function (evt) {
if (evt.target === /* mainContainer */ this) {
PDFViewerApplication.eventBus.dispatch("resize", { source: this });
eventBus.dispatch("resize", { source: this });
}
},
true
@ -2460,8 +2454,8 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
};
webViewerOpenFile = function (evt) {
const openFileInputName = PDFViewerApplication.appConfig.openFileInputName;
document.getElementById(openFileInputName).click();
const fileInput = PDFViewerApplication.appConfig.openFileInput;
fileInput.click();
};
}