From 32d204ae526a467152c9bdc52fc322461df99c10 Mon Sep 17 00:00:00 2001 From: Pdf Bot Date: Mon, 31 Oct 2016 22:05:24 +0000 Subject: [PATCH] PDF.js version 1.6.283 - See mozilla/pdf.js@e9c63a2b3274e7fc851fcdc0761bec7eefb3f4b6 --- bower.json | 2 +- build/pdf.combined.js | 4 +-- build/pdf.js | 4 +-- build/pdf.worker.js | 4 +-- package.json | 2 +- web/pdf_viewer.js | 59 ++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 66 insertions(+), 9 deletions(-) diff --git a/bower.json b/bower.json index f62a45cf3..99cd9f646 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.6.279", + "version": "1.6.283", "main": [ "build/pdf.js", "build/pdf.worker.js" diff --git a/build/pdf.combined.js b/build/pdf.combined.js index 1e53121e0..395cffc76 100644 --- a/build/pdf.combined.js +++ b/build/pdf.combined.js @@ -24,8 +24,8 @@ }(this, function (exports) { // Use strict in our context only - users might not want it 'use strict'; - var pdfjsVersion = '1.6.279'; - var pdfjsBuild = 'a740d69'; + var pdfjsVersion = '1.6.283'; + var pdfjsBuild = 'e9c63a2'; var pdfjsFilePath = typeof document !== 'undefined' && document.currentScript ? document.currentScript.src : null; var pdfjsLibs = {}; (function pdfjsWrapper() { diff --git a/build/pdf.js b/build/pdf.js index f1fcd85df..4876e543e 100644 --- a/build/pdf.js +++ b/build/pdf.js @@ -24,8 +24,8 @@ }(this, function (exports) { // Use strict in our context only - users might not want it 'use strict'; - var pdfjsVersion = '1.6.279'; - var pdfjsBuild = 'a740d69'; + var pdfjsVersion = '1.6.283'; + var pdfjsBuild = 'e9c63a2'; var pdfjsFilePath = typeof document !== 'undefined' && document.currentScript ? document.currentScript.src : null; var pdfjsLibs = {}; (function pdfjsWrapper() { diff --git a/build/pdf.worker.js b/build/pdf.worker.js index c7a51e3f3..821873ee1 100644 --- a/build/pdf.worker.js +++ b/build/pdf.worker.js @@ -24,8 +24,8 @@ }(this, function (exports) { // Use strict in our context only - users might not want it 'use strict'; - var pdfjsVersion = '1.6.279'; - var pdfjsBuild = 'a740d69'; + var pdfjsVersion = '1.6.283'; + var pdfjsBuild = 'e9c63a2'; var pdfjsFilePath = typeof document !== 'undefined' && document.currentScript ? document.currentScript.src : null; var pdfjsLibs = {}; (function pdfjsWrapper() { diff --git a/package.json b/package.json index f360dd3a8..e4d2723bd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.6.279", + "version": "1.6.283", "main": "build/pdf.js", "description": "Generic build of Mozilla's PDF.js library.", "keywords": [ diff --git a/web/pdf_viewer.js b/web/pdf_viewer.js index 7281e5027..0c7d0b537 100644 --- a/web/pdf_viewer.js +++ b/web/pdf_viewer.js @@ -2096,6 +2096,7 @@ var renderInteractiveForms = options.renderInteractiveForms || false; this.id = id; this.renderingId = 'page' + id; + this.pageLabel = null; this.rotation = 0; this.scale = scale || DEFAULT_SCALE; this.viewport = defaultViewport; @@ -2494,6 +2495,17 @@ self.onBeforeDraw(); } return promise; + }, + /** + * @param {string|null} label + */ + setPageLabel: function PDFView_setPageLabel(label) { + this.pageLabel = typeof label === 'string' ? label : null; + if (this.pageLabel !== null) { + this.div.setAttribute('data-page-label', this.pageLabel); + } else { + this.div.removeAttribute('data-page-label'); + } } }; return PDFPageView; @@ -3100,7 +3112,8 @@ } var arg = { source: this, - pageNumber: val + pageNumber: val, + pageLabel: this._pageLabels && this._pageLabels[val - 1] }; this._currentPageNumber = val; this.eventBus.dispatch('pagechanging', arg); @@ -3109,6 +3122,27 @@ this._resetCurrentPageView(); } }, + /** + * @returns {string|null} Returns the current page label, + * or `null` if no page labels exist. + */ + get currentPageLabel() { + return this._pageLabels && this._pageLabels[this._currentPageNumber - 1]; + }, + /** + * @param {string} val - The page label. + */ + set currentPageLabel(val) { + var pageNumber = val | 0; + // Fallback page number. + if (this._pageLabels) { + var i = this._pageLabels.indexOf(val); + if (i >= 0) { + pageNumber = i + 1; + } + } + this.currentPageNumber = pageNumber; + }, /** * @returns {number} */ @@ -3279,11 +3313,34 @@ } }.bind(this)); }, + /** + * @param {Array|null} labels + */ + setPageLabels: function PDFViewer_setPageLabels(labels) { + if (!this.pdfDocument) { + return; + } + if (!labels) { + this._pageLabels = null; + } else if (!(labels instanceof Array && this.pdfDocument.numPages === labels.length)) { + this._pageLabels = null; + console.error('PDFViewer_setPageLabels: Invalid page labels.'); + } else { + this._pageLabels = labels; + } + // Update all the `PDFPageView` instances. + for (var i = 0, ii = this._pages.length; i < ii; i++) { + var pageView = this._pages[i]; + var label = this._pageLabels && this._pageLabels[i]; + pageView.setPageLabel(label); + } + }, _resetView: function () { this._pages = []; this._currentPageNumber = 1; this._currentScale = UNKNOWN_SCALE; this._currentScaleValue = null; + this._pageLabels = null; this._buffer = new PDFPageViewBuffer(DEFAULT_CACHE_SIZE); this._location = null; this._pagesRotation = 0;