From 63f05139c6552f42e426b06e017b97d56e1e1d5b Mon Sep 17 00:00:00 2001 From: Pdf Bot Date: Tue, 6 Sep 2016 12:49:37 +0100 Subject: [PATCH] PDF.js version 1.5.434 - See mozilla/pdf.js@8dbb5a7c4a63782e24382f9773386d9facbfc557 --- bower.json | 2 +- build/pdf.combined.js | 61 ++++++++++++++++++++++++++++++++++--------- build/pdf.js | 47 +++++++++++++++++++++++++++------ build/pdf.worker.js | 18 ++++++++----- package.json | 2 +- 5 files changed, 100 insertions(+), 30 deletions(-) diff --git a/bower.json b/bower.json index fe67ada77..8cd534eb2 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.5.432", + "version": "1.5.434", "main": [ "build/pdf.js", "build/pdf.worker.js" diff --git a/build/pdf.combined.js b/build/pdf.combined.js index 4a8890844..4b5f7f958 100644 --- a/build/pdf.combined.js +++ b/build/pdf.combined.js @@ -28,8 +28,8 @@ factory((root.pdfjsDistBuildPdfCombined = {})); // Use strict in our context only - users might not want it 'use strict'; -var pdfjsVersion = '1.5.432'; -var pdfjsBuild = 'b26af7e'; +var pdfjsVersion = '1.5.434'; +var pdfjsBuild = '8dbb5a7'; var pdfjsFilePath = typeof document !== 'undefined' && document.currentScript ? @@ -24148,6 +24148,12 @@ AnnotationElementFactory.prototype = return new TextAnnotationElement(parameters); case AnnotationType.WIDGET: + var fieldType = parameters.data.fieldType; + + switch (fieldType) { + case 'Tx': + return new TextWidgetAnnotationElement(parameters); + } return new WidgetAnnotationElement(parameters); case AnnotationType.POPUP: @@ -24471,9 +24477,7 @@ var TextAnnotationElement = (function TextAnnotationElementClosure() { */ var WidgetAnnotationElement = (function WidgetAnnotationElementClosure() { function WidgetAnnotationElement(parameters) { - var isRenderable = !parameters.data.hasAppearance && - !!parameters.data.fieldValue; - AnnotationElement.call(this, parameters, isRenderable); + AnnotationElement.call(this, parameters, true); } Util.inherit(WidgetAnnotationElement, AnnotationElement, { @@ -24485,6 +24489,33 @@ var WidgetAnnotationElement = (function WidgetAnnotationElementClosure() { * @returns {HTMLSectionElement} */ render: function WidgetAnnotationElement_render() { + // Show only the container for unsupported field types. + return this.container; + } + }); + + return WidgetAnnotationElement; +})(); + +/** + * @class + * @alias TextWidgetAnnotationElement + */ +var TextWidgetAnnotationElement = ( + function TextWidgetAnnotationElementClosure() { + function TextWidgetAnnotationElement(parameters) { + WidgetAnnotationElement.call(this, parameters); + } + + Util.inherit(TextWidgetAnnotationElement, WidgetAnnotationElement, { + /** + * Render the text widget annotation's HTML element in the empty container. + * + * @public + * @memberof TextWidgetAnnotationElement + * @returns {HTMLSectionElement} + */ + render: function TextWidgetAnnotationElement_render() { var content = document.createElement('div'); content.textContent = this.data.fieldValue; var textAlignment = this.data.textAlignment; @@ -24506,10 +24537,10 @@ var WidgetAnnotationElement = (function WidgetAnnotationElementClosure() { * @private * @param {HTMLDivElement} element * @param {Object} font - * @memberof WidgetAnnotationElement + * @memberof TextWidgetAnnotationElement */ _setTextStyle: - function WidgetAnnotationElement_setTextStyle(element, font) { + function TextWidgetAnnotationElement_setTextStyle(element, font) { // TODO: This duplicates some of the logic in CanvasGraphics.setFont(). var style = element.style; style.fontSize = this.data.fontSize + 'px'; @@ -24531,7 +24562,7 @@ var WidgetAnnotationElement = (function WidgetAnnotationElementClosure() { } }); - return WidgetAnnotationElement; + return TextWidgetAnnotationElement; })(); /** @@ -48924,9 +48955,14 @@ AnnotationFactory.prototype = /** @lends AnnotationFactory.prototype */ { case 'Widget': var fieldType = Util.getInheritableProperty(dict, 'FT'); - if (isName(fieldType, 'Tx')) { - return new TextWidgetAnnotation(parameters); + fieldType = isName(fieldType) ? fieldType.name : null; + + switch (fieldType) { + case 'Tx': + return new TextWidgetAnnotation(parameters); } + warn('Unimplemented widget field type "' + fieldType + '", ' + + 'falling back to base field type.'); return new WidgetAnnotation(parameters); case 'Popup': @@ -49441,13 +49477,12 @@ var WidgetAnnotation = (function WidgetAnnotationClosure() { data.alternativeText = stringToPDFString(dict.get('TU') || ''); data.defaultAppearance = Util.getInheritableProperty(dict, 'DA') || ''; var fieldType = Util.getInheritableProperty(dict, 'FT'); - data.fieldType = isName(fieldType) ? fieldType.name : ''; + data.fieldType = isName(fieldType) ? fieldType.name : null; data.fieldFlags = Util.getInheritableProperty(dict, 'Ff') || 0; this.fieldResources = Util.getInheritableProperty(dict, 'DR') || Dict.empty; - // Hide unsupported Widget signatures. + // Hide signatures because we cannot validate them. if (data.fieldType === 'Sig') { - warn('unimplemented annotation type: Widget signature'); this.setFlags(AnnotationFlag.HIDDEN); } diff --git a/build/pdf.js b/build/pdf.js index 72afedcc8..6937013e4 100644 --- a/build/pdf.js +++ b/build/pdf.js @@ -28,8 +28,8 @@ factory((root.pdfjsDistBuildPdf = {})); // Use strict in our context only - users might not want it 'use strict'; -var pdfjsVersion = '1.5.432'; -var pdfjsBuild = 'b26af7e'; +var pdfjsVersion = '1.5.434'; +var pdfjsBuild = '8dbb5a7'; var pdfjsFilePath = typeof document !== 'undefined' && document.currentScript ? @@ -4342,6 +4342,12 @@ AnnotationElementFactory.prototype = return new TextAnnotationElement(parameters); case AnnotationType.WIDGET: + var fieldType = parameters.data.fieldType; + + switch (fieldType) { + case 'Tx': + return new TextWidgetAnnotationElement(parameters); + } return new WidgetAnnotationElement(parameters); case AnnotationType.POPUP: @@ -4665,9 +4671,7 @@ var TextAnnotationElement = (function TextAnnotationElementClosure() { */ var WidgetAnnotationElement = (function WidgetAnnotationElementClosure() { function WidgetAnnotationElement(parameters) { - var isRenderable = !parameters.data.hasAppearance && - !!parameters.data.fieldValue; - AnnotationElement.call(this, parameters, isRenderable); + AnnotationElement.call(this, parameters, true); } Util.inherit(WidgetAnnotationElement, AnnotationElement, { @@ -4679,6 +4683,33 @@ var WidgetAnnotationElement = (function WidgetAnnotationElementClosure() { * @returns {HTMLSectionElement} */ render: function WidgetAnnotationElement_render() { + // Show only the container for unsupported field types. + return this.container; + } + }); + + return WidgetAnnotationElement; +})(); + +/** + * @class + * @alias TextWidgetAnnotationElement + */ +var TextWidgetAnnotationElement = ( + function TextWidgetAnnotationElementClosure() { + function TextWidgetAnnotationElement(parameters) { + WidgetAnnotationElement.call(this, parameters); + } + + Util.inherit(TextWidgetAnnotationElement, WidgetAnnotationElement, { + /** + * Render the text widget annotation's HTML element in the empty container. + * + * @public + * @memberof TextWidgetAnnotationElement + * @returns {HTMLSectionElement} + */ + render: function TextWidgetAnnotationElement_render() { var content = document.createElement('div'); content.textContent = this.data.fieldValue; var textAlignment = this.data.textAlignment; @@ -4700,10 +4731,10 @@ var WidgetAnnotationElement = (function WidgetAnnotationElementClosure() { * @private * @param {HTMLDivElement} element * @param {Object} font - * @memberof WidgetAnnotationElement + * @memberof TextWidgetAnnotationElement */ _setTextStyle: - function WidgetAnnotationElement_setTextStyle(element, font) { + function TextWidgetAnnotationElement_setTextStyle(element, font) { // TODO: This duplicates some of the logic in CanvasGraphics.setFont(). var style = element.style; style.fontSize = this.data.fontSize + 'px'; @@ -4725,7 +4756,7 @@ var WidgetAnnotationElement = (function WidgetAnnotationElementClosure() { } }); - return WidgetAnnotationElement; + return TextWidgetAnnotationElement; })(); /** diff --git a/build/pdf.worker.js b/build/pdf.worker.js index 75ef79079..0327b7954 100644 --- a/build/pdf.worker.js +++ b/build/pdf.worker.js @@ -28,8 +28,8 @@ factory((root.pdfjsDistBuildPdfWorker = {})); // Use strict in our context only - users might not want it 'use strict'; -var pdfjsVersion = '1.5.432'; -var pdfjsBuild = 'b26af7e'; +var pdfjsVersion = '1.5.434'; +var pdfjsBuild = '8dbb5a7'; var pdfjsFilePath = typeof document !== 'undefined' && document.currentScript ? @@ -40197,9 +40197,14 @@ AnnotationFactory.prototype = /** @lends AnnotationFactory.prototype */ { case 'Widget': var fieldType = Util.getInheritableProperty(dict, 'FT'); - if (isName(fieldType, 'Tx')) { - return new TextWidgetAnnotation(parameters); + fieldType = isName(fieldType) ? fieldType.name : null; + + switch (fieldType) { + case 'Tx': + return new TextWidgetAnnotation(parameters); } + warn('Unimplemented widget field type "' + fieldType + '", ' + + 'falling back to base field type.'); return new WidgetAnnotation(parameters); case 'Popup': @@ -40714,13 +40719,12 @@ var WidgetAnnotation = (function WidgetAnnotationClosure() { data.alternativeText = stringToPDFString(dict.get('TU') || ''); data.defaultAppearance = Util.getInheritableProperty(dict, 'DA') || ''; var fieldType = Util.getInheritableProperty(dict, 'FT'); - data.fieldType = isName(fieldType) ? fieldType.name : ''; + data.fieldType = isName(fieldType) ? fieldType.name : null; data.fieldFlags = Util.getInheritableProperty(dict, 'Ff') || 0; this.fieldResources = Util.getInheritableProperty(dict, 'DR') || Dict.empty; - // Hide unsupported Widget signatures. + // Hide signatures because we cannot validate them. if (data.fieldType === 'Sig') { - warn('unimplemented annotation type: Widget signature'); this.setFlags(AnnotationFlag.HIDDEN); } diff --git a/package.json b/package.json index 17bec1142..51612e075 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pdfjs-dist", - "version": "1.5.432", + "version": "1.5.434", "main": "build/pdf.js", "description": "Generic build of Mozilla's PDF.js library.", "keywords": [