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

Merge pull request #12971 from nt1m/bool-attrs

Browse Source 
Use DOM hidden property instead of attribute methods
This commit is contained in:
Tim van der Meij 2021-02-08 20:14:44 +01:00 committed by GitHub
commit 884c65c602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 46 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
examples/mobile-viewer/viewer.js
View File

@ -135,7 +135,7 @@ var PDFViewerApplication = {
*/ */
close() { close() {
var errorWrapper = document.getElementById("errorWrapper"); var errorWrapper = document.getElementById("errorWrapper");
errorWrapper.setAttribute("hidden", "true"); errorWrapper.hidden = true;
if (!this.pdfLoadingTask) { if (!this.pdfLoadingTask) {
return Promise.resolve(); return Promise.resolve();
@ -270,32 +270,32 @@ var PDFViewerApplication = {
} }
var errorWrapper = document.getElementById("errorWrapper"); var errorWrapper = document.getElementById("errorWrapper");
errorWrapper.removeAttribute("hidden"); errorWrapper.hidden = false;
var errorMessage = document.getElementById("errorMessage"); var errorMessage = document.getElementById("errorMessage");
errorMessage.textContent = message; errorMessage.textContent = message;
var closeButton = document.getElementById("errorClose"); var closeButton = document.getElementById("errorClose");
closeButton.onclick = function () { closeButton.onclick = function () {
errorWrapper.setAttribute("hidden", "true"); errorWrapper.hidden = true;
}; };
var errorMoreInfo = document.getElementById("errorMoreInfo"); var errorMoreInfo = document.getElementById("errorMoreInfo");
var moreInfoButton = document.getElementById("errorShowMore"); var moreInfoButton = document.getElementById("errorShowMore");
var lessInfoButton = document.getElementById("errorShowLess"); var lessInfoButton = document.getElementById("errorShowLess");
moreInfoButton.onclick = function () { moreInfoButton.onclick = function () {
errorMoreInfo.removeAttribute("hidden"); errorMoreInfo.hidden = false;
moreInfoButton.setAttribute("hidden", "true"); moreInfoButton.hidden = true;
lessInfoButton.removeAttribute("hidden"); lessInfoButton.hidden = false;
errorMoreInfo.style.height = errorMoreInfo.scrollHeight + "px"; errorMoreInfo.style.height = errorMoreInfo.scrollHeight + "px";
}; };
lessInfoButton.onclick = function () { lessInfoButton.onclick = function () {
errorMoreInfo.setAttribute("hidden", "true"); errorMoreInfo.hidden = true;
moreInfoButton.removeAttribute("hidden"); moreInfoButton.hidden = false;
lessInfoButton.setAttribute("hidden", "true"); lessInfoButton.hidden = true;
}; };
moreInfoButton.removeAttribute("hidden"); moreInfoButton.hidden = false;
lessInfoButton.setAttribute("hidden", "true"); lessInfoButton.hidden = true;
Promise.all(moreInfoText).then(function (parts) { Promise.all(moreInfoText).then(function (parts) {
errorMoreInfo.value = parts.join("\n"); errorMoreInfo.value = parts.join("\n");
}); });

12
src/display/annotation_layer.js
View File

@ -1353,7 +1353,7 @@ class PopupElement {
// annotation, we cannot hide the entire container as the image would // annotation, we cannot hide the entire container as the image would
// disappear too. In that special case, hiding the wrapper suffices. // disappear too. In that special case, hiding the wrapper suffices.
this.hideElement = this.hideWrapper ? wrapper : this.container; this.hideElement = this.hideWrapper ? wrapper : this.container;
this.hideElement.setAttribute("hidden", true); this.hideElement.hidden = true;
const popup = document.createElement("div"); const popup = document.createElement("div");
popup.className = "popup"; popup.className = "popup";
@ -1451,8 +1451,8 @@ class PopupElement {
if (pin) { if (pin) {
this.pinned = true; this.pinned = true;
} }
if (this.hideElement.hasAttribute("hidden")) { if (this.hideElement.hidden) {
this.hideElement.removeAttribute("hidden"); this.hideElement.hidden = false;
this.container.style.zIndex += 1; this.container.style.zIndex += 1;
} }
} }
@ -1468,8 +1468,8 @@ class PopupElement {
if (unpin) { if (unpin) {
this.pinned = false; this.pinned = false;
} }
if (!this.hideElement.hasAttribute("hidden") && !this.pinned) { if (!this.hideElement.hidden && !this.pinned) {
this.hideElement.setAttribute("hidden", true); this.hideElement.hidden = true;
this.container.style.zIndex -= 1; this.container.style.zIndex -= 1;
} }
} }
@ -2061,7 +2061,7 @@ class AnnotationLayer {
}); });
} }
} }
parameters.div.removeAttribute("hidden"); parameters.div.hidden = false;
} }
} }

2
web/annotation_layer_builder.js
View File

@ -125,7 +125,7 @@ class AnnotationLayerBuilder {
if (!this.div) { if (!this.div) {
return; return;
} }
this.div.setAttribute("hidden", "true"); this.div.hidden = true;
} }
} }

41
web/app.js
View File

@ -815,7 +815,7 @@ const PDFViewerApplication = {
this._unblockDocumentLoadEvent(); this._unblockDocumentLoadEvent();
const errorWrapper = this.appConfig.errorWrapper.container; const errorWrapper = this.appConfig.errorWrapper.container;
errorWrapper.setAttribute("hidden", "true"); errorWrapper.hidden = true;
if (!this.pdfLoadingTask) { if (!this.pdfLoadingTask) {
return undefined; return undefined;
@ -1180,35 +1180,35 @@ const PDFViewerApplication = {
if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")) { if (typeof PDFJSDev === "undefined" || !PDFJSDev.test("MOZCENTRAL")) {
const errorWrapperConfig = this.appConfig.errorWrapper; const errorWrapperConfig = this.appConfig.errorWrapper;
const errorWrapper = errorWrapperConfig.container; const errorWrapper = errorWrapperConfig.container;
errorWrapper.removeAttribute("hidden"); errorWrapper.hidden = false;
const errorMessage = errorWrapperConfig.errorMessage; const errorMessage = errorWrapperConfig.errorMessage;
errorMessage.textContent = message; errorMessage.textContent = message;
const closeButton = errorWrapperConfig.closeButton; const closeButton = errorWrapperConfig.closeButton;
closeButton.onclick = function () { closeButton.onclick = function () {
errorWrapper.setAttribute("hidden", "true"); errorWrapper.hidden = true;
}; };
const errorMoreInfo = errorWrapperConfig.errorMoreInfo; const errorMoreInfo = errorWrapperConfig.errorMoreInfo;
const moreInfoButton = errorWrapperConfig.moreInfoButton; const moreInfoButton = errorWrapperConfig.moreInfoButton;
const lessInfoButton = errorWrapperConfig.lessInfoButton; const lessInfoButton = errorWrapperConfig.lessInfoButton;
moreInfoButton.onclick = function () { moreInfoButton.onclick = function () {
errorMoreInfo.removeAttribute("hidden"); errorMoreInfo.hidden = false;
moreInfoButton.setAttribute("hidden", "true"); moreInfoButton.hidden = true;
lessInfoButton.removeAttribute("hidden"); lessInfoButton.hidden = false;
errorMoreInfo.style.height = errorMoreInfo.scrollHeight + "px"; errorMoreInfo.style.height = errorMoreInfo.scrollHeight + "px";
}; };
lessInfoButton.onclick = function () { lessInfoButton.onclick = function () {
errorMoreInfo.setAttribute("hidden", "true"); errorMoreInfo.hidden = true;
moreInfoButton.removeAttribute("hidden"); moreInfoButton.hidden = false;
lessInfoButton.setAttribute("hidden", "true"); lessInfoButton.hidden = true;
}; };
moreInfoButton.oncontextmenu = noContextMenuHandler; moreInfoButton.oncontextmenu = noContextMenuHandler;
lessInfoButton.oncontextmenu = noContextMenuHandler; lessInfoButton.oncontextmenu = noContextMenuHandler;
closeButton.oncontextmenu = noContextMenuHandler; closeButton.oncontextmenu = noContextMenuHandler;
moreInfoButton.removeAttribute("hidden"); moreInfoButton.hidden = false;
lessInfoButton.setAttribute("hidden", "true"); lessInfoButton.hidden = true;
Promise.all(moreInfoText).then(parts => { Promise.all(moreInfoText).then(parts => {
errorMoreInfo.value = parts.join("\n"); errorMoreInfo.value = parts.join("\n");
}); });
@ -2473,8 +2473,8 @@ function webViewerInitialized() {
!window.FileList || !window.FileList ||
!window.Blob !window.Blob
) { ) {
appConfig.toolbar.openFile.setAttribute("hidden", "true"); appConfig.toolbar.openFile.hidden = true;
appConfig.secondaryToolbar.openFileButton.setAttribute("hidden", "true"); appConfig.secondaryToolbar.openFileButton.hidden = true;
} else { } else {
fileInput.value = null; fileInput.value = null;
} }
@ -2509,8 +2509,8 @@ function webViewerInitialized() {
}); });
}); });
} else { } else {
appConfig.toolbar.openFile.setAttribute("hidden", "true"); appConfig.toolbar.openFile.hidden = true;
appConfig.secondaryToolbar.openFileButton.setAttribute("hidden", "true"); appConfig.secondaryToolbar.openFileButton.hidden = true;
} }
if (!PDFViewerApplication.supportsDocumentFonts) { if (!PDFViewerApplication.supportsDocumentFonts) {
@ -2819,13 +2819,10 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
// URL does not reflect proper document location - hiding some icons. // URL does not reflect proper document location - hiding some icons.
const appConfig = PDFViewerApplication.appConfig; const appConfig = PDFViewerApplication.appConfig;
appConfig.toolbar.viewBookmark.setAttribute("hidden", "true"); appConfig.toolbar.viewBookmark.hidden = true;
appConfig.secondaryToolbar.viewBookmarkButton.setAttribute( appConfig.secondaryToolbar.viewBookmarkButton.hidden = true;
"hidden", appConfig.toolbar.download.hidden = true;
"true" appConfig.secondaryToolbar.downloadButton.hidden = true;
);
appConfig.toolbar.download.setAttribute("hidden", "true");
appConfig.secondaryToolbar.downloadButton.setAttribute("hidden", "true");
}; };
webViewerOpenFile = function (evt) { webViewerOpenFile = function (evt) {

21
web/debugger.js
View File

@ -201,7 +201,7 @@ var StepperManager = (function StepperManagerClosure() {
create: function create(pageIndex) { create: function create(pageIndex) {
var debug = document.createElement("div"); var debug = document.createElement("div");
debug.id = "stepper" + pageIndex; debug.id = "stepper" + pageIndex;
debug.setAttribute("hidden", true); debug.hidden = true;
debug.className = "stepper"; debug.className = "stepper";
stepperDiv.appendChild(debug); stepperDiv.appendChild(debug);
var b = document.createElement("option"); var b = document.createElement("option");
@ -224,11 +224,7 @@ var StepperManager = (function StepperManagerClosure() {
} }
for (i = 0; i < steppers.length; ++i) { for (i = 0; i < steppers.length; ++i) {
var stepper = steppers[i]; var stepper = steppers[i];
if (stepper.pageIndex === pageIndex) { stepper.panel.hidden = stepper.pageIndex !== pageIndex;
stepper.panel.removeAttribute("hidden");
} else {
stepper.panel.setAttribute("hidden", true);
}
} }
var options = stepperChooser.options; var options = stepperChooser.options;
for (i = 0; i < options.length; ++i) { for (i = 0; i < options.length; ++i) {
@ -608,15 +604,10 @@ window.PDFBug = (function PDFBugClosure() {
activePanel = index; activePanel = index;
var tools = this.tools; var tools = this.tools;
for (var j = 0; j < tools.length; ++j) { for (var j = 0; j < tools.length; ++j) {
if (j === index) { var isActive = j === index;
buttons[j].setAttribute("class", "active"); buttons[j].classList.toggle("active", isActive);
tools[j].active = true; tools[j].active = isActive;
tools[j].panel.removeAttribute("hidden"); tools[j].panel.hidden = !isActive;
} else {
buttons[j].setAttribute("class", "");
tools[j].active = false;
tools[j].panel.setAttribute("hidden", "true");
}
} }
}, },
}; };

6
web/pdf_page_view.js
View File

@ -296,7 +296,7 @@ class PDFPageView {
}); });
return; return;
} }
if (!this.zoomLayer && !this.canvas.hasAttribute("hidden")) { if (!this.zoomLayer && !this.canvas.hidden) {
this.zoomLayer = this.canvas.parentNode; this.zoomLayer = this.canvas.parentNode;
this.zoomLayer.style.position = "absolute"; this.zoomLayer.style.position = "absolute";
} }
@ -587,11 +587,11 @@ class PDFPageView {
// Keep the canvas hidden until the first draw callback, or until drawing // Keep the canvas hidden until the first draw callback, or until drawing
// is complete when `!this.renderingQueue`, to prevent black flickering. // is complete when `!this.renderingQueue`, to prevent black flickering.
canvas.setAttribute("hidden", "hidden"); canvas.hidden = true;
let isCanvasHidden = true; let isCanvasHidden = true;
const showCanvas = function () { const showCanvas = function () {
if (isCanvasHidden) { if (isCanvasHidden) {
canvas.removeAttribute("hidden"); canvas.hidden = false;
isCanvasHidden = false; isCanvasHidden = false;
} }
}; };