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

Use more optional chaining in the web/-folder (PR 12961 follow-up)

Browse Source 
I overlooked these cases previously, but there's no reason why optional chaining (and nullish coalescing) cannot be used here as well.
This commit is contained in:
Jonas Jenwald 2021-03-07 16:12:29 +01:00
parent bdde621366
commit bc13932ac1
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/pdf_find_controller.js
View File

@ -771,7 +771,7 @@ class PDFFindController {
total = this._matchesCountTotal; total = this._matchesCountTotal;
if (matchIdx !== -1) { if (matchIdx !== -1) {
for (let i = 0; i < pageIdx; i++) { for (let i = 0; i < pageIdx; i++) {
current += (this._pageMatches[i] && this._pageMatches[i].length) || 0; current += this._pageMatches[i]?.length || 0;
} }
current += matchIdx + 1; current += matchIdx + 1;
} }
@ -797,7 +797,7 @@ class PDFFindController {
state, state,
previous, previous,
matchesCount: this._requestMatchesCount(), matchesCount: this._requestMatchesCount(),
rawQuery: this._state ? this._state.query : null, rawQuery: this._state?.query ?? null,
}); });
} }
} }

7
web/pdf_sidebar_resizer.js
View File

@ -53,10 +53,7 @@ class PDFSidebarResizer {
* @type {number} * @type {number}
*/ */
get outerContainerWidth() { get outerContainerWidth() {
if (!this._outerContainerWidth) { return (this._outerContainerWidth ||= this.outerContainer.clientWidth);
this._outerContainerWidth = this.outerContainer.clientWidth;
}
return this._outerContainerWidth;
} }
/** /**
@ -135,7 +132,7 @@ class PDFSidebarResizer {
this.eventBus._on("resize", evt => { this.eventBus._on("resize", evt => {
// When the *entire* viewer is resized, such that it becomes narrower, // When the *entire* viewer is resized, such that it becomes narrower,
// ensure that the sidebar doesn't end up being too wide. // ensure that the sidebar doesn't end up being too wide.
if (!evt || evt.source !== window) { if (evt?.source !== window) {
return; return;
} }
// Always reset the cached width when the viewer is resized. // Always reset the cached width when the viewer is resized.