From 50a4510ab76745bee9ee57d3701b035ba12a1b8c Mon Sep 17 00:00:00 2001 From: Chris Peterson Date: Sat, 23 Aug 2014 00:12:55 -0700 Subject: [PATCH 1/2] Auto zoom landscape documents to fit their height --- web/viewer.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/viewer.js b/web/viewer.js index 4a4282eda3f3a..0845c1836ef6b 100644 --- a/web/viewer.js +++ b/web/viewer.js @@ -359,7 +359,9 @@ var PDFView = { scale = Math.min(pageWidthScale, pageHeightScale); break; case 'auto': - scale = Math.min(MAX_AUTO_SCALE, pageWidthScale); + var isLandscape = (currentPage.width > currentPage.height); + var horizontalScale = isLandscape ? pageHeightScale : pageWidthScale; + scale = Math.min(MAX_AUTO_SCALE, horizontalScale); break; default: console.error('pdfViewSetScale: \'' + value + From 81d5bd86ea30ca37ef34ac7eb1d4db330b158823 Mon Sep 17 00:00:00 2001 From: Chris Peterson Date: Sat, 23 Aug 2014 00:14:44 -0700 Subject: [PATCH 2/2] Replace magic scale value 0 with UNKNOWN_SCALE --- web/viewer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/viewer.js b/web/viewer.js index 0845c1836ef6b..50a0cc83bdbea 100644 --- a/web/viewer.js +++ b/web/viewer.js @@ -1213,7 +1213,7 @@ var PDFView = { setInitialView: function pdfViewSetInitialView(storedHash, scale) { // Reset the current scale, as otherwise the page's scale might not get // updated if the zoom level stayed the same. - this.currentScale = 0; + this.currentScale = UNKNOWN_SCALE; this.currentScaleValue = null; // When opening a new file (when one is already loaded in the viewer): // Reset 'currentPageNumber', since otherwise the page's scale will be wrong