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

Merge pull request #8555 from Snuffleupagus/viewer-components-pdfDocument-checks

Browse Source 
Don't allow setting various properties, such as `currentPageNumber`/`currentScale`/`currentScaleValue`/`pagesRotation`, before `{PDFViewer, PDFThumbnailViewer}.setDocument` has been called
This commit is contained in:
Jonas Jenwald 2017-07-06 06:30:13 +02:00 committed by GitHub
commit 12f1b747b1
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/pdf_thumbnail_viewer.js
View File

@ -95,8 +95,15 @@ class PDFThumbnailViewer {
}
set pagesRotation(rotation) {
if (!(typeof rotation === 'number' && rotation % 90 === 0)) {
throw new Error('Invalid thumbnails rotation angle.');
}
if (!this.pdfDocument) {
return;
}
this._pagesRotation = rotation;
for (let i = 0, l = this._thumbnails.length; i < l; i++) {
for (let i = 0, ii = this._thumbnails.length; i < ii; i++) {
this._thumbnails[i].update(rotation);
}
}

17
web/pdf_viewer.js
View File

@ -166,7 +166,6 @@ var PDFViewer = (function pdfViewer() {
throw new Error('Invalid page number.');
}
if (!this.pdfDocument) {
this._currentPageNumber = val;
return;
}
// The intent can be to just reset a scroll position and/or scale.
@ -217,9 +216,9 @@ var PDFViewer = (function pdfViewer() {
* @param {string} val - The page label.
*/
set currentPageLabel(val) {
var pageNumber = val | 0; // Fallback page number.
let pageNumber = val | 0; // Fallback page number.
if (this._pageLabels) {
var i = this._pageLabels.indexOf(val);
let i = this._pageLabels.indexOf(val);
if (i >= 0) {
pageNumber = i + 1;
}
@ -243,8 +242,6 @@ var PDFViewer = (function pdfViewer() {
throw new Error('Invalid numeric scale');
}
if (!this.pdfDocument) {
this._currentScale = val;
this._currentScaleValue = val !== UNKNOWN_SCALE ? val.toString() : null;
return;
}
this._setScale(val, false);
@ -262,8 +259,6 @@ var PDFViewer = (function pdfViewer() {
*/
set currentScaleValue(val) {
if (!this.pdfDocument) {
this._currentScale = isNaN(val) ? UNKNOWN_SCALE : val;
this._currentScaleValue = val.toString();
return;
}
this._setScale(val, false);
@ -283,13 +278,13 @@ var PDFViewer = (function pdfViewer() {
if (!(typeof rotation === 'number' && rotation % 90 === 0)) {
throw new Error('Invalid pages rotation angle.');
}
this._pagesRotation = rotation;
if (!this.pdfDocument) {
return;
}
for (var i = 0, l = this._pages.length; i < l; i++) {
var pageView = this._pages[i];
this._pagesRotation = rotation;
for (let i = 0, ii = this._pages.length; i < ii; i++) {
let pageView = this._pages[i];
pageView.update(pageView.scale, rotation);
}