Simple pdf.js page viewer

diff --cc web/viewer.js index b58c3ec,e43a462..fdf8f9f --- a/web/viewer.js +++ b/web/viewer.js @@@ -489,16 -489,10 +489,10 @@@ var PDFView = while (container.hasChildNodes()) container.removeChild(container.lastChild); - var pdf; - try { - pdf = new PDFJS.PDFDoc(data); - } catch (e) { - this.error('An error occurred while reading the PDF.', e); - } - var pagesCount = pdf.numPages; - var id = pdf.fingerprint; + var pagesCount = pdfDocument.numPages; + var id = pdfDocument.fingerprint; var storedHash = null; - document.getElementById('numPages').textContent = pagesCount; + document.getElementById('numPages').textContent = '/ ' + pagesCount; document.getElementById('pageNumber').max = pagesCount; PDFView.documentFingerprint = id; var store = PDFView.store = new Settings(id); @@@ -514,30 -508,68 +508,68 @@@ var pages = this.pages = []; var pagesRefMap = {}; var thumbnails = this.thumbnails = []; - for (var i = 1; i <= pagesCount; i++) { - var page = pdf.getPage(i); - var pageView = new PageView(container, page, i, page.width, page.height, - page.stats, this.navigateTo.bind(this)); - var thumbnailView = new ThumbnailView(thumbsView, page, i, - page.width / page.height); - bindOnAfterDraw(pageView, thumbnailView); - - pages.push(pageView); - thumbnails.push(thumbnailView); - var pageRef = page.ref; - pagesRefMap[pageRef.num + ' ' + pageRef.gen + ' R'] = i; - } + var pagePromises = []; + for (var i = 1; i <= pagesCount; i++) + pagePromises.push(pdfDocument.getPage(i)); + var self = this; + var pagesPromise = PDFJS.Promise.all(pagePromises); + pagesPromise.then(function(promisedPages) { + for (var i = 1; i <= pagesCount; i++) { + var page = promisedPages[i - 1]; + var pageView = new PageView(container, page, i, scale, + page.stats, self.navigateTo.bind(self)); - var thumbnailView = new ThumbnailView(sidebar, page, i); ++ var thumbnailView = new ThumbnailView(thumbsView, page, i); + bindOnAfterDraw(pageView, thumbnailView); + + pages.push(pageView); + thumbnails.push(thumbnailView); + var pageRef = page.ref; + pagesRefMap[pageRef.num + ' ' + pageRef.gen + ' R'] = i; + } - this.pagesRefMap = pagesRefMap; - this.destinations = pdf.catalog.destinations; + self.pagesRefMap = pagesRefMap; + }); - if (pdf.catalog.documentOutline) { - this.outline = new DocumentOutlineView(pdf.catalog.documentOutline); - var outlineSwitchButton = document.getElementById('viewOutline'); - outlineSwitchButton.removeAttribute('disabled'); - this.switchSidebarView('outline'); - } + var destinationsPromise = pdfDocument.getDestinations(); + destinationsPromise.then(function(destinations) { + self.destinations = destinations; + }); + + // outline and initial view depends on destinations and pagesRefMap + PDFJS.Promise.all([pagesPromise, destinationsPromise]).then(function() { + pdfDocument.getOutline().then(function(outline) { + if (!outline) + return; + self.outline = new DocumentOutlineView(outline); - var outlineSwitchButton = document.getElementById('outlineSwitch'); ++ var outlineSwitchButton = document.getElementById('viewOutline'); + outlineSwitchButton.removeAttribute('disabled'); + self.switchSidebarView('outline'); + }); + + self.setInitialView(storedHash, scale); + }); + + pdfDocument.getMetadata().then(function(data) { + var info = data.info, metadata = data.metadata; + self.documentInfo = info; + self.metadata = metadata; + + var pdfTitle; + if (metadata) { + if (metadata.has('dc:title')) + pdfTitle = metadata.get('dc:title'); + } + + if (!pdfTitle && info && info['Title']) + pdfTitle = info['Title']; + + if (pdfTitle) + document.title = pdfTitle + ' - ' + document.title; + }); + }, + + 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; @@@ -671,10 -688,9 +685,10 @@@ var kBottomMargin = 5; var visibleThumbs = []; - var view = document.getElementById('sidebarScrollView'); + var view = document.getElementById('thumbnailView'); var currentHeight = kBottomMargin; -- var top = view.scrollTop; - ++ ++ var top = view.scrollTop; for (var i = 1; i <= thumbs.length; ++i) { var thumb = thumbs[i - 1]; var thumbHeight = thumb.height * thumb.scaleY + kBottomMargin; @@@ -985,15 -1037,19 +1035,16 @@@ var ThumbnailView = function thumbnailV return false; }; - var view = page.view; - this.width = view.width; - this.height = view.height; + var viewport = pdfPage.getViewport(1); + var pageWidth = viewport.width; + var pageHeight = viewport.height; + var pageRatio = pageWidth / pageHeight; this.id = id; - var maxThumbSize = 134; - var canvasWidth = this.width = pageRatio >= 1 ? maxThumbSize : - maxThumbSize * pageRatio; - var canvasHeight = this.height = pageRatio <= 1 ? maxThumbSize : - maxThumbSize / pageRatio; + var canvasWidth = 98; + var canvasHeight = canvasWidth / this.width * this.height; - var scaleX = this.scaleX = (canvasWidth / this.width); - var scaleY = this.scaleY = (canvasHeight / this.height); + var scaleX = this.scaleX = (canvasWidth / pageWidth); + var scaleY = this.scaleY = (canvasHeight / pageHeight); var div = document.createElement('div'); div.id = 'thumbnailContainer' + id; @@@ -1011,14 -1067,9 +1062,14 @@@ canvas.width = canvasWidth; canvas.height = canvasHeight; + canvas.className = 'thumbnailImage'; div.setAttribute('data-loaded', true); - - div.appendChild(canvas); ++ + var ring = document.createElement('div'); + ring.className = 'thumbnailSelectionRing'; + ring.appendChild(canvas); + div.appendChild(ring); var ctx = canvas.getContext('2d'); ctx.save(); @@@ -1263,16 -1321,9 +1319,18 @@@ window.addEventListener('load', functio PDFBug.init(); } - var sidebarScrollView = document.getElementById('sidebarScrollView'); - sidebarScrollView.addEventListener('scroll', updateThumbViewArea, true); + var thumbsView = document.getElementById('thumbnailView'); + thumbsView.addEventListener('scroll', updateThumbViewArea, true); + + document.getElementById('sidebarToggle').addEventListener('click', + function() { + this.classList.toggle('toggled'); + document.getElementById('toolbarSidebar').classList.toggle('hidden'); + document.getElementById('sidebarContainer').classList.toggle('hidden'); + updateThumbViewArea(); + }); ++ + PDFView.open(file, 0); }, true); /**