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

Adjust the displayed pageSize, in the document properties dialog, depending on the current *viewer* rotation (PR 9586 follow-up)

Browse Source 
Please note that the behaviour implemented here mirrors the one used in Adobe Reader.
This commit is contained in:
Jonas Jenwald 2018-03-20 13:37:19 +01:00
parent b7b5d93231
commit ab74b32054
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/pdf_document_properties.js
View File

@ -55,6 +55,9 @@ class PDFDocumentProperties {
eventBus.on('pagechanging', (evt) => { eventBus.on('pagechanging', (evt) => {
this._currentPageNumber = evt.pageNumber; this._currentPageNumber = evt.pageNumber;
}); });
eventBus.on('rotationchanging', (evt) => {
this._pagesRotation = evt.pagesRotation;
});
} }
} }
@ -74,11 +77,13 @@ class PDFDocumentProperties {
Promise.all([this.overlayManager.open(this.overlayName), Promise.all([this.overlayManager.open(this.overlayName),
this._dataAvailableCapability.promise]).then(() => { this._dataAvailableCapability.promise]).then(() => {
const currentPageNumber = this._currentPageNumber; const currentPageNumber = this._currentPageNumber;
const pagesRotation = this._pagesRotation;
// If the document properties were previously fetched (for this PDF file), // If the document properties were previously fetched (for this PDF file),
// just update the dialog immediately to avoid redundant lookups. // just update the dialog immediately to avoid redundant lookups.
if (this.fieldData && if (this.fieldData &&
currentPageNumber === this.fieldData['_currentPageNumber']) { currentPageNumber === this.fieldData['_currentPageNumber'] &&
pagesRotation === this.fieldData['_pagesRotation']) {
this._updateUI(); this._updateUI();
return; return;
} }
@ -94,7 +99,8 @@ class PDFDocumentProperties {
this._parseDate(info.CreationDate), this._parseDate(info.CreationDate),
this._parseDate(info.ModDate), this._parseDate(info.ModDate),
this.pdfDocument.getPage(currentPageNumber).then((pdfPage) => { this.pdfDocument.getPage(currentPageNumber).then((pdfPage) => {
return this._parsePageSize(getPageSizeInches(pdfPage)); return this._parsePageSize(getPageSizeInches(pdfPage),
pagesRotation);
}), }),
]); ]);
}).then(([info, metadata, fileName, fileSize, creationDate, modDate, }).then(([info, metadata, fileName, fileSize, creationDate, modDate,
@ -115,6 +121,7 @@ class PDFDocumentProperties {
'pageSizeInch': pageSizes.inch, 'pageSizeInch': pageSizes.inch,
'pageSizeMM': pageSizes.mm, 'pageSizeMM': pageSizes.mm,
'_currentPageNumber': currentPageNumber, '_currentPageNumber': currentPageNumber,
'_pagesRotation': pagesRotation,
}); });
this._updateUI(); this._updateUI();
@ -191,6 +198,7 @@ class PDFDocumentProperties {
delete this.fieldData; delete this.fieldData;
this._dataAvailableCapability = createPromiseCapability(); this._dataAvailableCapability = createPromiseCapability();
this._currentPageNumber = 1; this._currentPageNumber = 1;
this._pagesRotation = 0;
} }
/** /**
@ -240,10 +248,17 @@ class PDFDocumentProperties {
/** /**
* @private * @private
*/ */
_parsePageSize(pageSizeInches) { _parsePageSize(pageSizeInches, pagesRotation) {
if (!pageSizeInches) { if (!pageSizeInches) {
return Promise.resolve({ inch: undefined, mm: undefined, }); return Promise.resolve({ inch: undefined, mm: undefined, });
} }
// Take the viewer rotation into account as well; compare with Adobe Reader.
if (pagesRotation % 180 !== 0) {
pageSizeInches = {
width: pageSizeInches.height,
height: pageSizeInches.width,
};
}
const { width, height, } = pageSizeInches; const { width, height, } = pageSizeInches;
return Promise.all([ return Promise.all([