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

Remove the BaseViewer._name property, used only when logging errors

Browse Source 
The original idea behind including the class name, when logging errors, was to improve things in the *hypothetical case* where `PDFViewer`- and `PDFSinglePageViewer`-instances would be used side-by-side.
Given that all of the relevant methods are synchronous this seem unlikely to really be necessary, and furthermore it's probably best to avoid using `this.constructor.name` since that's not guaranteed to do what you intend (we've seen repeated issues with minifiers mangling function/class names).
This commit is contained in:
Jonas Jenwald 2021-08-09 12:05:50 +02:00
parent 6167566f1b
commit 5ac139dea1
1 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
web/base_viewer.js
View File

@ -152,8 +152,6 @@ class BaseViewer {
`The API version "${version}" does not match the Viewer version "${viewerVersion}".` `The API version "${version}" does not match the Viewer version "${viewerVersion}".`
); );
} }
this._name = this.constructor.name;
this.container = options.container; this.container = options.container;
this.viewer = options.viewer || options.container.firstElementChild; this.viewer = options.viewer || options.container.firstElementChild;
@ -267,9 +265,7 @@ class BaseViewer {
} }
// The intent can be to just reset a scroll position and/or scale. // The intent can be to just reset a scroll position and/or scale.
if (!this._setCurrentPageNumber(val, /* resetCurrentPageView = */ true)) { if (!this._setCurrentPageNumber(val, /* resetCurrentPageView = */ true)) {
console.error( console.error(`currentPageNumber: "${val}" is not a valid page.`);
`${this._name}.currentPageNumber: "${val}" is not a valid page.`
);
} }
} }
@ -328,9 +324,7 @@ class BaseViewer {
} }
// The intent can be to just reset a scroll position and/or scale. // The intent can be to just reset a scroll position and/or scale.
if (!this._setCurrentPageNumber(page, /* resetCurrentPageView = */ true)) { if (!this._setCurrentPageNumber(page, /* resetCurrentPageView = */ true)) {
console.error( console.error(`currentPageLabel: "${val}" is not a valid page.`);
`${this._name}.currentPageLabel: "${val}" is not a valid page.`
);
} }
} }
@ -642,7 +636,7 @@ class BaseViewer {
!(Array.isArray(labels) && this.pdfDocument.numPages === labels.length) !(Array.isArray(labels) && this.pdfDocument.numPages === labels.length)
) { ) {
this._pageLabels = null; this._pageLabels = null;
console.error(`${this._name}.setPageLabels: Invalid page labels.`); console.error(`setPageLabels: Invalid page labels.`);
} else { } else {
this._pageLabels = labels; this._pageLabels = labels;
} }
@ -808,9 +802,7 @@ class BaseViewer {
scale = Math.min(MAX_AUTO_SCALE, horizontalScale); scale = Math.min(MAX_AUTO_SCALE, horizontalScale);
break; break;
default: default:
console.error( console.error(`_setScale: "${value}" is an unknown zoom value.`);
`${this._name}._setScale: "${value}" is an unknown zoom value.`
);
return; return;
} }
this._setScaleUpdatePages(scale, value, noScroll, /* preset = */ true); this._setScaleUpdatePages(scale, value, noScroll, /* preset = */ true);
@ -875,8 +867,7 @@ class BaseViewer {
Number.isInteger(pageNumber) && this._pages[pageNumber - 1]; Number.isInteger(pageNumber) && this._pages[pageNumber - 1];
if (!pageView) { if (!pageView) {
console.error( console.error(
`${this._name}.scrollPageIntoView: ` + `scrollPageIntoView: "${pageNumber}" is not a valid pageNumber parameter.`
`"${pageNumber}" is not a valid pageNumber parameter.`
); );
return; return;
} }
@ -955,8 +946,7 @@ class BaseViewer {
break; break;
default: default:
console.error( console.error(
`${this._name}.scrollPageIntoView: ` + `scrollPageIntoView: "${destArray[1].name}" is not a valid destination type.`
`"${destArray[1].name}" is not a valid destination type.`
); );
return; return;
} }
@ -1143,9 +1133,7 @@ class BaseViewer {
pageNumber <= this.pagesCount pageNumber <= this.pagesCount
) )
) { ) {
console.error( console.error(`isPageVisible: "${pageNumber}" is not a valid page.`);
`${this._name}.isPageVisible: "${pageNumber}" is not a valid page.`
);
return false; return false;
} }
return this._getVisiblePages().views.some(function (view) { return this._getVisiblePages().views.some(function (view) {
@ -1167,9 +1155,7 @@ class BaseViewer {
pageNumber <= this.pagesCount pageNumber <= this.pagesCount
) )
) { ) {
console.error( console.error(`isPageCached: "${pageNumber}" is not a valid page.`);
`${this._name}.isPageCached: "${pageNumber}" is not a valid page.`
);
return false; return false;
} }
const pageView = this._pages[pageNumber - 1]; const pageView = this._pages[pageNumber - 1];