akira
/
pdfjs-dist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

PDF.js version 1.3.26 - See mozilla/pdf.js@4b243cdd89d28387ad3505c13356ca804a127b75

master v1.3.26
Pdf Bot 9 years ago
parent
9d9b13363e
commit
c7902dc992
6 changed files with 85 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      bower.json
  2. 45
      build/pdf.combined.js
  3. 33
      build/pdf.js
  4. 16
      build/pdf.worker.js
  5. 2
      package.json
  6. 13
      web/pdf_viewer.js

2
bower.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "pdfjs-dist", "name": "pdfjs-dist",
"version": "1.3.24", "version": "1.3.26",
"main": [ "main": [
"build/pdf.js", "build/pdf.js",
"build/pdf.worker.js" "build/pdf.worker.js"

45
build/pdf.combined.js
Unescape View File

@ -20,8 +20,8 @@ if (typeof PDFJS === 'undefined') {
(typeof window !== 'undefined' ? window : this).PDFJS = {}; (typeof window !== 'undefined' ? window : this).PDFJS = {};
} }
PDFJS.version = '1.3.24'; PDFJS.version = '1.3.26';
PDFJS.build = 'dcd2812'; PDFJS.build = '4b243cd';
(function pdfjsWrapper() { (function pdfjsWrapper() {
// Use strict in our context only - users might not want it // Use strict in our context only - users might not want it
@ -2277,6 +2277,16 @@ var PDFDocumentProxy = (function PDFDocumentProxyClosure() {
* @property {string} fontFamily - possible font family * @property {string} fontFamily - possible font family
*/ */
/**
* Page annotation parameters.
*
* @typedef {Object} GetAnnotationsParameters
* @param {string} intent - Determines the annotations that will be fetched,
* can be either 'display' (viewable annotations) or 'print'
* (printable annotations).
* If the parameter is omitted, all annotations are fetched.
*/
/** /**
* Page render parameters. * Page render parameters.
* *
@ -2365,12 +2375,17 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
return new PDFJS.PageViewport(this.view, scale, rotate, 0, 0); return new PDFJS.PageViewport(this.view, scale, rotate, 0, 0);
}, },
/** /**
* @param {GetAnnotationsParameters} params - Annotation parameters.
* @return {Promise} A promise that is resolved with an {Array} of the * @return {Promise} A promise that is resolved with an {Array} of the
* annotation objects. * annotation objects.
*/ */
getAnnotations: function PDFPageProxy_getAnnotations() { getAnnotations: function PDFPageProxy_getAnnotations(params) {
if (!this.annotationsPromise) { var intent = (params && params.intent) || null;
this.annotationsPromise = this.transport.getAnnotations(this.pageIndex);
if (!this.annotationsPromise || this.annotationsIntent !== intent) {
this.annotationsPromise = this.transport.getAnnotations(this.pageIndex,
intent);
this.annotationsIntent = intent;
} }
return this.annotationsPromise; return this.annotationsPromise;
}, },
@ -3044,9 +3059,11 @@ var WorkerTransport = (function WorkerTransportClosure() {
return this.messageHandler.sendWithPromise('GetPageIndex', { ref: ref }); return this.messageHandler.sendWithPromise('GetPageIndex', { ref: ref });
}, },
getAnnotations: function WorkerTransport_getAnnotations(pageIndex) { getAnnotations: function WorkerTransport_getAnnotations(pageIndex, intent) {
return this.messageHandler.sendWithPromise('GetAnnotations', return this.messageHandler.sendWithPromise('GetAnnotations', {
{ pageIndex: pageIndex }); pageIndex: pageIndex,
intent: intent,
});
}, },
getDestinations: function WorkerTransport_getDestinations() { getDestinations: function WorkerTransport_getDestinations() {
@ -9756,10 +9773,16 @@ var Page = (function PageClosure() {
}); });
}, },
getAnnotationsData: function Page_getAnnotationsData() { getAnnotationsData: function Page_getAnnotationsData(intent) {
var annotations = this.annotations; var annotations = this.annotations;
var annotationsData = []; var annotationsData = [];
for (var i = 0, n = annotations.length; i < n; ++i) { for (var i = 0, n = annotations.length; i < n; ++i) {
if (intent) {
if (!(intent === 'display' && annotations[i].viewable) &&
!(intent === 'print' && annotations[i].printable)) {
continue;
}
}
annotationsData.push(annotations[i].data); annotationsData.push(annotations[i].data);
} }
return annotationsData; return annotationsData;
@ -9772,7 +9795,7 @@ var Page = (function PageClosure() {
for (var i = 0, n = annotationRefs.length; i < n; ++i) { for (var i = 0, n = annotationRefs.length; i < n; ++i) {
var annotationRef = annotationRefs[i]; var annotationRef = annotationRefs[i];
var annotation = annotationFactory.create(this.xref, annotationRef); var annotation = annotationFactory.create(this.xref, annotationRef);
if (annotation && (annotation.viewable || annotation.printable)) { if (annotation) {
annotations.push(annotation); annotations.push(annotation);
} }
} }
@ -41733,7 +41756,7 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
handler.on('GetAnnotations', function wphSetupGetAnnotations(data) { handler.on('GetAnnotations', function wphSetupGetAnnotations(data) {
return pdfManager.getPage(data.pageIndex).then(function(page) { return pdfManager.getPage(data.pageIndex).then(function(page) {
return pdfManager.ensure(page, 'getAnnotationsData', []); return pdfManager.ensure(page, 'getAnnotationsData', [data.intent]);
}); });
}); });

33
build/pdf.js
Unescape View File

@ -20,8 +20,8 @@ if (typeof PDFJS === 'undefined') {
(typeof window !== 'undefined' ? window : this).PDFJS = {}; (typeof window !== 'undefined' ? window : this).PDFJS = {};
} }
PDFJS.version = '1.3.24'; PDFJS.version = '1.3.26';
PDFJS.build = 'dcd2812'; PDFJS.build = '4b243cd';
(function pdfjsWrapper() { (function pdfjsWrapper() {
// Use strict in our context only - users might not want it // Use strict in our context only - users might not want it
@ -2286,6 +2286,16 @@ var PDFDocumentProxy = (function PDFDocumentProxyClosure() {
* @property {string} fontFamily - possible font family * @property {string} fontFamily - possible font family
*/ */
/**
* Page annotation parameters.
*
* @typedef {Object} GetAnnotationsParameters
* @param {string} intent - Determines the annotations that will be fetched,
* can be either 'display' (viewable annotations) or 'print'
* (printable annotations).
* If the parameter is omitted, all annotations are fetched.
*/
/** /**
* Page render parameters. * Page render parameters.
* *
@ -2374,12 +2384,17 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
return new PDFJS.PageViewport(this.view, scale, rotate, 0, 0); return new PDFJS.PageViewport(this.view, scale, rotate, 0, 0);
}, },
/** /**
* @param {GetAnnotationsParameters} params - Annotation parameters.
* @return {Promise} A promise that is resolved with an {Array} of the * @return {Promise} A promise that is resolved with an {Array} of the
* annotation objects. * annotation objects.
*/ */
getAnnotations: function PDFPageProxy_getAnnotations() { getAnnotations: function PDFPageProxy_getAnnotations(params) {
if (!this.annotationsPromise) { var intent = (params && params.intent) || null;
this.annotationsPromise = this.transport.getAnnotations(this.pageIndex);
if (!this.annotationsPromise || this.annotationsIntent !== intent) {
this.annotationsPromise = this.transport.getAnnotations(this.pageIndex,
intent);
this.annotationsIntent = intent;
} }
return this.annotationsPromise; return this.annotationsPromise;
}, },
@ -3097,9 +3112,11 @@ var WorkerTransport = (function WorkerTransportClosure() {
return this.messageHandler.sendWithPromise('GetPageIndex', { ref: ref }); return this.messageHandler.sendWithPromise('GetPageIndex', { ref: ref });
}, },
getAnnotations: function WorkerTransport_getAnnotations(pageIndex) { getAnnotations: function WorkerTransport_getAnnotations(pageIndex, intent) {
return this.messageHandler.sendWithPromise('GetAnnotations', return this.messageHandler.sendWithPromise('GetAnnotations', {
{ pageIndex: pageIndex }); pageIndex: pageIndex,
intent: intent,
});
}, },
getDestinations: function WorkerTransport_getDestinations() { getDestinations: function WorkerTransport_getDestinations() {

16
build/pdf.worker.js vendored
Unescape View File

@ -20,8 +20,8 @@ if (typeof PDFJS === 'undefined') {
(typeof window !== 'undefined' ? window : this).PDFJS = {}; (typeof window !== 'undefined' ? window : this).PDFJS = {};
} }
PDFJS.version = '1.3.24'; PDFJS.version = '1.3.26';
PDFJS.build = 'dcd2812'; PDFJS.build = '4b243cd';
(function pdfjsWrapper() { (function pdfjsWrapper() {
// Use strict in our context only - users might not want it // Use strict in our context only - users might not want it
@ -2869,10 +2869,16 @@ var Page = (function PageClosure() {
}); });
}, },
getAnnotationsData: function Page_getAnnotationsData() { getAnnotationsData: function Page_getAnnotationsData(intent) {
var annotations = this.annotations; var annotations = this.annotations;
var annotationsData = []; var annotationsData = [];
for (var i = 0, n = annotations.length; i < n; ++i) { for (var i = 0, n = annotations.length; i < n; ++i) {
if (intent) {
if (!(intent === 'display' && annotations[i].viewable) &&
!(intent === 'print' && annotations[i].printable)) {
continue;
}
}
annotationsData.push(annotations[i].data); annotationsData.push(annotations[i].data);
} }
return annotationsData; return annotationsData;
@ -2885,7 +2891,7 @@ var Page = (function PageClosure() {
for (var i = 0, n = annotationRefs.length; i < n; ++i) { for (var i = 0, n = annotationRefs.length; i < n; ++i) {
var annotationRef = annotationRefs[i]; var annotationRef = annotationRefs[i];
var annotation = annotationFactory.create(this.xref, annotationRef); var annotation = annotationFactory.create(this.xref, annotationRef);
if (annotation && (annotation.viewable || annotation.printable)) { if (annotation) {
annotations.push(annotation); annotations.push(annotation);
} }
} }
@ -34846,7 +34852,7 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
handler.on('GetAnnotations', function wphSetupGetAnnotations(data) { handler.on('GetAnnotations', function wphSetupGetAnnotations(data) {
return pdfManager.getPage(data.pageIndex).then(function(page) { return pdfManager.getPage(data.pageIndex).then(function(page) {
return pdfManager.ensure(page, 'getAnnotationsData', []); return pdfManager.ensure(page, 'getAnnotationsData', [data.intent]);
}); });
}); });

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "pdfjs-dist", "name": "pdfjs-dist",
"version": "1.3.24", "version": "1.3.26",
"description": "Generic build of Mozilla's PDF.js library.", "description": "Generic build of Mozilla's PDF.js library.",
"keywords": [ "keywords": [
"Mozilla", "Mozilla",

13
web/pdf_viewer.js
Unescape View File

@ -1143,7 +1143,7 @@ var PDFPageView = (function PDFPageViewClosure() {
} }
if (redrawAnnotations && this.annotationLayer) { if (redrawAnnotations && this.annotationLayer) {
this.annotationLayer.setupAnnotations(this.viewport); this.annotationLayer.setupAnnotations(this.viewport, 'display');
} }
}, },
@ -1363,7 +1363,7 @@ var PDFPageView = (function PDFPageViewClosure() {
this.annotationLayer = this.annotationsLayerFactory. this.annotationLayer = this.annotationsLayerFactory.
createAnnotationsLayerBuilder(div, this.pdfPage); createAnnotationsLayerBuilder(div, this.pdfPage);
} }
this.annotationLayer.setupAnnotations(this.viewport); this.annotationLayer.setupAnnotations(this.viewport, 'display');
} }
div.setAttribute('data-loaded', true); div.setAttribute('data-loaded', true);
@ -1794,9 +1794,10 @@ var AnnotationsLayerBuilder = (function AnnotationsLayerBuilderClosure() {
/** /**
* @param {PageViewport} viewport * @param {PageViewport} viewport
* @param {string} intent (default value is 'display')
*/ */
setupAnnotations: setupAnnotations:
function AnnotationsLayerBuilder_setupAnnotations(viewport) { function AnnotationsLayerBuilder_setupAnnotations(viewport, intent) {
function bindLink(link, dest) { function bindLink(link, dest) {
link.href = linkService.getDestinationHash(dest); link.href = linkService.getDestinationHash(dest);
link.onclick = function annotationsLayerBuilderLinksOnclick() { link.onclick = function annotationsLayerBuilderLinksOnclick() {
@ -1822,8 +1823,12 @@ var AnnotationsLayerBuilder = (function AnnotationsLayerBuilderClosure() {
var linkService = this.linkService; var linkService = this.linkService;
var pdfPage = this.pdfPage; var pdfPage = this.pdfPage;
var self = this; var self = this;
var getAnnotationsParams = {
intent: (intent === undefined ? 'display' : intent),
};
pdfPage.getAnnotations().then(function (annotationsData) { pdfPage.getAnnotations(getAnnotationsParams).then(
function (annotationsData) {
viewport = viewport.clone({ dontFlip: true }); viewport = viewport.clone({ dontFlip: true });
var transform = viewport.transform; var transform = viewport.transform;
var transformStr = 'matrix(' + transform.join(',') + ')'; var transformStr = 'matrix(' + transform.join(',') + ')';

Write Preview
Loading…
Cancel
Save