From c41b5e4ff1618df70ede97090cf07788b7e68667 Mon Sep 17 00:00:00 2001 From: Pdf Bot Date: Thu, 19 Mar 2015 18:45:08 +0000 Subject: [PATCH] PDF.js version 1.1.9 --- bower.json | 2 +- build/pdf.combined.js | 4 ++-- build/pdf.js | 4 ++-- build/pdf.worker.js | 4 ++-- package.json | 2 +- web/pdf_viewer.css | 5 +++++ web/pdf_viewer.js | 20 ++++++++++++++++---- 7 files changed, 29 insertions(+), 12 deletions(-) diff --git a/bower.json b/bower.json index a7c6041cb..84d4df8ec 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.1.7", + "version": "1.1.9", "main": [ "build/pdf.js", "build/pdf.worker.js" diff --git a/build/pdf.combined.js b/build/pdf.combined.js index 2cbdf0fcc..9bbf9faf3 100644 --- a/build/pdf.combined.js +++ b/build/pdf.combined.js @@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') { (typeof window !== 'undefined' ? window : this).PDFJS = {}; } -PDFJS.version = '1.1.7'; -PDFJS.build = '43064e3'; +PDFJS.version = '1.1.9'; +PDFJS.build = 'c5eb34e'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it diff --git a/build/pdf.js b/build/pdf.js index b3053ff01..ae9c8df62 100644 --- a/build/pdf.js +++ b/build/pdf.js @@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') { (typeof window !== 'undefined' ? window : this).PDFJS = {}; } -PDFJS.version = '1.1.7'; -PDFJS.build = '43064e3'; +PDFJS.version = '1.1.9'; +PDFJS.build = 'c5eb34e'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it diff --git a/build/pdf.worker.js b/build/pdf.worker.js index f51a2ff86..e0fa54e5f 100644 --- a/build/pdf.worker.js +++ b/build/pdf.worker.js @@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') { (typeof window !== 'undefined' ? window : this).PDFJS = {}; } -PDFJS.version = '1.1.7'; -PDFJS.build = '43064e3'; +PDFJS.version = '1.1.9'; +PDFJS.build = 'c5eb34e'; (function pdfjsWrapper() { // Use strict in our context only - users might not want it diff --git a/package.json b/package.json index d394cc2c1..dd126de1a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.1.7", + "version": "1.1.9", "description": "Generic build of Mozilla's PDF.js library.", "keywords": [ "Mozilla", diff --git a/web/pdf_viewer.css b/web/pdf_viewer.css index 351992e5e..76ec3a871 100644 --- a/web/pdf_viewer.css +++ b/web/pdf_viewer.css @@ -79,6 +79,11 @@ background-color: white; } +.pdfViewer.removePageBorders .page { + margin: 0px auto 10px auto; + border: none; +} + .pdfViewer .page canvas { margin: 0; display: block; diff --git a/web/pdf_viewer.js b/web/pdf_viewer.js index 1b9d7983c..25e68e312 100644 --- a/web/pdf_viewer.js +++ b/web/pdf_viewer.js @@ -1664,6 +1664,8 @@ DefaultAnnotationsLayerFactory.prototype = { * @property {IPDFLinkService} linkService - The navigation/linking service. * @property {PDFRenderingQueue} renderingQueue - (optional) The rendering * queue object. + * @property {boolean} removePageBorders - (optional) Removes the border shadow + * around the pages. The default is false. */ /** @@ -1700,6 +1702,7 @@ var PDFViewer = (function pdfViewer() { this.container = options.container; this.viewer = options.viewer || options.container.firstElementChild; this.linkService = options.linkService || new SimpleLinkService(this); + this.removePageBorders = options.removePageBorders || false; this.defaultRenderingQueue = !options.renderingQueue; if (this.defaultRenderingQueue) { @@ -1714,6 +1717,10 @@ var PDFViewer = (function pdfViewer() { this.updateInProgress = false; this.presentationModeState = PresentationModeState.UNKNOWN; this._resetView(); + + if (this.removePageBorders) { + this.viewer.classList.add('removePageBorders'); + } } PDFViewer.prototype = /** @lends PDFViewer.prototype */{ @@ -2017,8 +2024,10 @@ var PDFViewer = (function pdfViewer() { } var inPresentationMode = this.presentationModeState === PresentationModeState.FULLSCREEN; - var hPadding = inPresentationMode ? 0 : SCROLLBAR_PADDING; - var vPadding = inPresentationMode ? 0 : VERTICAL_PADDING; + var hPadding = (inPresentationMode || this.removePageBorders) ? + 0 : SCROLLBAR_PADDING; + var vPadding = (inPresentationMode || this.removePageBorders) ? + 0 : VERTICAL_PADDING; var pageWidthScale = (this.container.clientWidth - hPadding) / currentPage.width * currentPage.scale; var pageHeightScale = (this.container.clientHeight - vPadding) / @@ -2121,9 +2130,12 @@ var PDFViewer = (function pdfViewer() { width = dest[4] - x; height = dest[5] - y; var viewerContainer = this.container; - widthScale = (viewerContainer.clientWidth - SCROLLBAR_PADDING) / + var hPadding = this.removePageBorders ? 0 : SCROLLBAR_PADDING; + var vPadding = this.removePageBorders ? 0 : VERTICAL_PADDING; + + widthScale = (viewerContainer.clientWidth - hPadding) / width / CSS_UNITS; - heightScale = (viewerContainer.clientHeight - SCROLLBAR_PADDING) / + heightScale = (viewerContainer.clientHeight - vPadding) / height / CSS_UNITS; scale = Math.min(Math.abs(widthScale), Math.abs(heightScale)); break;