Browse Source

PDF.js version 2.0.163 - See mozilla/pdf.js@3e34eb31d940f5e8add0af5ee9b262c9f3ad1462

master v2.0.163
pdfjsbot 7 years ago
parent
commit
0de0fa5081
  1. 2
      bower.json
  2. 123
      build/pdf.combined.js
  3. 2
      build/pdf.combined.js.map
  4. 68
      build/pdf.js
  5. 2
      build/pdf.js.map
  6. 2
      build/pdf.min.js
  7. 59
      build/pdf.worker.js
  8. 2
      build/pdf.worker.js.map
  9. 2
      build/pdf.worker.min.js
  10. 53
      lib/core/annotation.js
  11. 2
      lib/core/worker.js
  12. 54
      lib/display/annotation_layer.js
  13. 6
      lib/display/api.js
  14. 4
      lib/display/global.js
  15. 4
      lib/pdf.js
  16. 4
      lib/pdf.worker.js
  17. 2
      package.json
  18. 12
      web/pdf_viewer.css

2
bower.json

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

123
build/pdf.combined.js

@ -11607,7 +11607,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) { @@ -11607,7 +11607,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
if (worker.destroyed) {
return Promise.reject(new Error('Worker was destroyed'));
}
var apiVersion = '2.0.161';
var apiVersion = '2.0.163';
source.disableRange = (0, _dom_utils.getDefaultSetting)('disableRange');
source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch');
source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream');
@ -12887,8 +12887,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() { @@ -12887,8 +12887,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
}();
var version, build;
{
exports.version = version = '2.0.161';
exports.build = build = 'b32d659d';
exports.version = version = '2.0.163';
exports.build = build = '3e34eb31';
}
exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort;
@ -23940,6 +23940,8 @@ Object.defineProperty(exports, "__esModule", { @@ -23940,6 +23940,8 @@ Object.defineProperty(exports, "__esModule", {
});
exports.AnnotationLayer = undefined;
var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } };
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
var _dom_utils = __w_pdfjs_require__(12);
@ -23977,8 +23979,7 @@ var AnnotationElementFactory = function () { @@ -23977,8 +23979,7 @@ var AnnotationElementFactory = function () {
} else if (parameters.data.checkBox) {
return new CheckboxWidgetAnnotationElement(parameters);
}
(0, _util.warn)('Unimplemented button widget annotation: pushbutton');
break;
return new PushButtonWidgetAnnotationElement(parameters);
case 'Ch':
return new ChoiceWidgetAnnotationElement(parameters);
}
@ -24367,6 +24368,27 @@ var RadioButtonWidgetAnnotationElement = function (_WidgetAnnotationElem3) { @@ -24367,6 +24368,27 @@ var RadioButtonWidgetAnnotationElement = function (_WidgetAnnotationElem3) {
return RadioButtonWidgetAnnotationElement;
}(WidgetAnnotationElement);
var PushButtonWidgetAnnotationElement = function (_LinkAnnotationElemen) {
_inherits(PushButtonWidgetAnnotationElement, _LinkAnnotationElemen);
function PushButtonWidgetAnnotationElement() {
_classCallCheck(this, PushButtonWidgetAnnotationElement);
return _possibleConstructorReturn(this, (PushButtonWidgetAnnotationElement.__proto__ || Object.getPrototypeOf(PushButtonWidgetAnnotationElement)).apply(this, arguments));
}
_createClass(PushButtonWidgetAnnotationElement, [{
key: 'render',
value: function render() {
var container = _get(PushButtonWidgetAnnotationElement.prototype.__proto__ || Object.getPrototypeOf(PushButtonWidgetAnnotationElement.prototype), 'render', this).call(this);
container.className = 'buttonWidgetAnnotation pushButton';
return container;
}
}]);
return PushButtonWidgetAnnotationElement;
}(LinkAnnotationElement);
var ChoiceWidgetAnnotationElement = function (_WidgetAnnotationElem4) {
_inherits(ChoiceWidgetAnnotationElement, _WidgetAnnotationElem4);
@ -24661,11 +24683,11 @@ var PolylineAnnotationElement = function (_AnnotationElement8) { @@ -24661,11 +24683,11 @@ var PolylineAnnotationElement = function (_AnnotationElement8) {
var isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
var _this14 = _possibleConstructorReturn(this, (PolylineAnnotationElement.__proto__ || Object.getPrototypeOf(PolylineAnnotationElement)).call(this, parameters, isRenderable, true));
var _this15 = _possibleConstructorReturn(this, (PolylineAnnotationElement.__proto__ || Object.getPrototypeOf(PolylineAnnotationElement)).call(this, parameters, isRenderable, true));
_this14.containerClassName = 'polylineAnnotation';
_this14.svgElementName = 'svg:polyline';
return _this14;
_this15.containerClassName = 'polylineAnnotation';
_this15.svgElementName = 'svg:polyline';
return _this15;
}
_createClass(PolylineAnnotationElement, [{
@ -24706,11 +24728,11 @@ var PolygonAnnotationElement = function (_PolylineAnnotationEl) { @@ -24706,11 +24728,11 @@ var PolygonAnnotationElement = function (_PolylineAnnotationEl) {
function PolygonAnnotationElement(parameters) {
_classCallCheck(this, PolygonAnnotationElement);
var _this15 = _possibleConstructorReturn(this, (PolygonAnnotationElement.__proto__ || Object.getPrototypeOf(PolygonAnnotationElement)).call(this, parameters));
var _this16 = _possibleConstructorReturn(this, (PolygonAnnotationElement.__proto__ || Object.getPrototypeOf(PolygonAnnotationElement)).call(this, parameters));
_this15.containerClassName = 'polygonAnnotation';
_this15.svgElementName = 'svg:polygon';
return _this15;
_this16.containerClassName = 'polygonAnnotation';
_this16.svgElementName = 'svg:polygon';
return _this16;
}
return PolygonAnnotationElement;
@ -24842,17 +24864,17 @@ var FileAttachmentAnnotationElement = function (_AnnotationElement14) { @@ -24842,17 +24864,17 @@ var FileAttachmentAnnotationElement = function (_AnnotationElement14) {
function FileAttachmentAnnotationElement(parameters) {
_classCallCheck(this, FileAttachmentAnnotationElement);
var _this21 = _possibleConstructorReturn(this, (FileAttachmentAnnotationElement.__proto__ || Object.getPrototypeOf(FileAttachmentAnnotationElement)).call(this, parameters, true));
var _this22 = _possibleConstructorReturn(this, (FileAttachmentAnnotationElement.__proto__ || Object.getPrototypeOf(FileAttachmentAnnotationElement)).call(this, parameters, true));
var file = _this21.data.file;
_this21.filename = (0, _dom_utils.getFilenameFromUrl)(file.filename);
_this21.content = file.content;
_this21.linkService.onFileAttachmentAnnotation({
var file = _this22.data.file;
_this22.filename = (0, _dom_utils.getFilenameFromUrl)(file.filename);
_this22.content = file.content;
_this22.linkService.onFileAttachmentAnnotation({
id: (0, _util.stringToPDFString)(file.filename),
filename: file.filename,
content: file.content
});
return _this21;
return _this22;
}
_createClass(FileAttachmentAnnotationElement, [{
@ -26521,8 +26543,8 @@ exports.SVGGraphics = SVGGraphics; @@ -26521,8 +26543,8 @@ exports.SVGGraphics = SVGGraphics;
"use strict";
var pdfjsVersion = '2.0.161';
var pdfjsBuild = 'b32d659d';
var pdfjsVersion = '2.0.163';
var pdfjsBuild = '3e34eb31';
var pdfjsSharedUtil = __w_pdfjs_require__(0);
var pdfjsDisplayGlobal = __w_pdfjs_require__(129);
var pdfjsDisplayAPI = __w_pdfjs_require__(65);
@ -31851,8 +31873,8 @@ if (!_global_scope2.default.PDFJS) { @@ -31851,8 +31873,8 @@ if (!_global_scope2.default.PDFJS) {
}
var PDFJS = _global_scope2.default.PDFJS;
{
PDFJS.version = '2.0.161';
PDFJS.build = 'b32d659d';
PDFJS.version = '2.0.163';
PDFJS.build = '3e34eb31';
}
PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) {
@ -35202,7 +35224,7 @@ var WorkerMessageHandler = { @@ -35202,7 +35224,7 @@ var WorkerMessageHandler = {
var cancelXHRs = null;
var WorkerTasks = [];
var apiVersion = docParams.apiVersion;
var workerVersion = '2.0.161';
var workerVersion = '2.0.163';
if (apiVersion !== null && apiVersion !== workerVersion) {
throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".'));
}
@ -39810,40 +39832,69 @@ var ButtonWidgetAnnotation = function (_WidgetAnnotation2) { @@ -39810,40 +39832,69 @@ var ButtonWidgetAnnotation = function (_WidgetAnnotation2) {
var _this4 = _possibleConstructorReturn(this, (ButtonWidgetAnnotation.__proto__ || Object.getPrototypeOf(ButtonWidgetAnnotation)).call(this, params));
_this4.data.checkBox = !_this4.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !_this4.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
_this4.data.radioButton = _this4.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !_this4.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
_this4.data.pushButton = _this4.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
if (_this4.data.checkBox) {
if (!(0, _primitives.isName)(_this4.data.fieldValue)) {
return _possibleConstructorReturn(_this4);
_this4._processCheckBox();
} else if (_this4.data.radioButton) {
_this4._processRadioButton(params);
} else if (_this4.data.pushButton) {
_this4._processPushButton(params);
} else {
(0, _util.warn)('Invalid field flags for button widget annotation');
}
return _this4;
}
_createClass(ButtonWidgetAnnotation, [{
key: '_processCheckBox',
value: function _processCheckBox() {
if (!(0, _primitives.isName)(this.data.fieldValue)) {
return;
}
_this4.data.fieldValue = _this4.data.fieldValue.name;
this.data.fieldValue = this.data.fieldValue.name;
}
_this4.data.radioButton = _this4.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !_this4.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
if (_this4.data.radioButton) {
_this4.data.fieldValue = _this4.data.buttonValue = null;
}, {
key: '_processRadioButton',
value: function _processRadioButton(params) {
this.data.fieldValue = this.data.buttonValue = null;
var fieldParent = params.dict.get('Parent');
if ((0, _primitives.isDict)(fieldParent) && fieldParent.has('V')) {
var fieldParentValue = fieldParent.get('V');
if ((0, _primitives.isName)(fieldParentValue)) {
_this4.data.fieldValue = fieldParentValue.name;
this.data.fieldValue = fieldParentValue.name;
}
}
var appearanceStates = params.dict.get('AP');
if (!(0, _primitives.isDict)(appearanceStates)) {
return _possibleConstructorReturn(_this4);
return;
}
var normalAppearanceState = appearanceStates.get('N');
if (!(0, _primitives.isDict)(normalAppearanceState)) {
return _possibleConstructorReturn(_this4);
return;
}
var keys = normalAppearanceState.getKeys();
for (var i = 0, ii = keys.length; i < ii; i++) {
if (keys[i] !== 'Off') {
_this4.data.buttonValue = keys[i];
this.data.buttonValue = keys[i];
break;
}
}
}
return _this4;
}
}, {
key: '_processPushButton',
value: function _processPushButton(params) {
if (!params.dict.has('A')) {
(0, _util.warn)('Push buttons without action dictionaries are not supported');
return;
}
_obj.Catalog.parseDestDictionary({
destDict: params.dict,
resultObj: this.data,
docBaseUrl: params.pdfManager.docBaseUrl
});
}
}]);
return ButtonWidgetAnnotation;
}(WidgetAnnotation);

2
build/pdf.combined.js.map

File diff suppressed because one or more lines are too long

68
build/pdf.js

@ -3290,7 +3290,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) { @@ -3290,7 +3290,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
if (worker.destroyed) {
return Promise.reject(new Error('Worker was destroyed'));
}
var apiVersion = '2.0.161';
var apiVersion = '2.0.163';
source.disableRange = (0, _dom_utils.getDefaultSetting)('disableRange');
source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch');
source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream');
@ -4651,8 +4651,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() { @@ -4651,8 +4651,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
}();
var version, build;
{
exports.version = version = '2.0.161';
exports.build = build = 'b32d659d';
exports.version = version = '2.0.163';
exports.build = build = '3e34eb31';
}
exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort;
@ -4778,6 +4778,8 @@ Object.defineProperty(exports, "__esModule", { @@ -4778,6 +4778,8 @@ Object.defineProperty(exports, "__esModule", {
});
exports.AnnotationLayer = undefined;
var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } };
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
var _dom_utils = __w_pdfjs_require__(10);
@ -4815,8 +4817,7 @@ var AnnotationElementFactory = function () { @@ -4815,8 +4817,7 @@ var AnnotationElementFactory = function () {
} else if (parameters.data.checkBox) {
return new CheckboxWidgetAnnotationElement(parameters);
}
(0, _util.warn)('Unimplemented button widget annotation: pushbutton');
break;
return new PushButtonWidgetAnnotationElement(parameters);
case 'Ch':
return new ChoiceWidgetAnnotationElement(parameters);
}
@ -5205,6 +5206,27 @@ var RadioButtonWidgetAnnotationElement = function (_WidgetAnnotationElem3) { @@ -5205,6 +5206,27 @@ var RadioButtonWidgetAnnotationElement = function (_WidgetAnnotationElem3) {
return RadioButtonWidgetAnnotationElement;
}(WidgetAnnotationElement);
var PushButtonWidgetAnnotationElement = function (_LinkAnnotationElemen) {
_inherits(PushButtonWidgetAnnotationElement, _LinkAnnotationElemen);
function PushButtonWidgetAnnotationElement() {
_classCallCheck(this, PushButtonWidgetAnnotationElement);
return _possibleConstructorReturn(this, (PushButtonWidgetAnnotationElement.__proto__ || Object.getPrototypeOf(PushButtonWidgetAnnotationElement)).apply(this, arguments));
}
_createClass(PushButtonWidgetAnnotationElement, [{
key: 'render',
value: function render() {
var container = _get(PushButtonWidgetAnnotationElement.prototype.__proto__ || Object.getPrototypeOf(PushButtonWidgetAnnotationElement.prototype), 'render', this).call(this);
container.className = 'buttonWidgetAnnotation pushButton';
return container;
}
}]);
return PushButtonWidgetAnnotationElement;
}(LinkAnnotationElement);
var ChoiceWidgetAnnotationElement = function (_WidgetAnnotationElem4) {
_inherits(ChoiceWidgetAnnotationElement, _WidgetAnnotationElem4);
@ -5499,11 +5521,11 @@ var PolylineAnnotationElement = function (_AnnotationElement8) { @@ -5499,11 +5521,11 @@ var PolylineAnnotationElement = function (_AnnotationElement8) {
var isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
var _this14 = _possibleConstructorReturn(this, (PolylineAnnotationElement.__proto__ || Object.getPrototypeOf(PolylineAnnotationElement)).call(this, parameters, isRenderable, true));
var _this15 = _possibleConstructorReturn(this, (PolylineAnnotationElement.__proto__ || Object.getPrototypeOf(PolylineAnnotationElement)).call(this, parameters, isRenderable, true));
_this14.containerClassName = 'polylineAnnotation';
_this14.svgElementName = 'svg:polyline';
return _this14;
_this15.containerClassName = 'polylineAnnotation';
_this15.svgElementName = 'svg:polyline';
return _this15;
}
_createClass(PolylineAnnotationElement, [{
@ -5544,11 +5566,11 @@ var PolygonAnnotationElement = function (_PolylineAnnotationEl) { @@ -5544,11 +5566,11 @@ var PolygonAnnotationElement = function (_PolylineAnnotationEl) {
function PolygonAnnotationElement(parameters) {
_classCallCheck(this, PolygonAnnotationElement);
var _this15 = _possibleConstructorReturn(this, (PolygonAnnotationElement.__proto__ || Object.getPrototypeOf(PolygonAnnotationElement)).call(this, parameters));
var _this16 = _possibleConstructorReturn(this, (PolygonAnnotationElement.__proto__ || Object.getPrototypeOf(PolygonAnnotationElement)).call(this, parameters));
_this15.containerClassName = 'polygonAnnotation';
_this15.svgElementName = 'svg:polygon';
return _this15;
_this16.containerClassName = 'polygonAnnotation';
_this16.svgElementName = 'svg:polygon';
return _this16;
}
return PolygonAnnotationElement;
@ -5680,17 +5702,17 @@ var FileAttachmentAnnotationElement = function (_AnnotationElement14) { @@ -5680,17 +5702,17 @@ var FileAttachmentAnnotationElement = function (_AnnotationElement14) {
function FileAttachmentAnnotationElement(parameters) {
_classCallCheck(this, FileAttachmentAnnotationElement);
var _this21 = _possibleConstructorReturn(this, (FileAttachmentAnnotationElement.__proto__ || Object.getPrototypeOf(FileAttachmentAnnotationElement)).call(this, parameters, true));
var _this22 = _possibleConstructorReturn(this, (FileAttachmentAnnotationElement.__proto__ || Object.getPrototypeOf(FileAttachmentAnnotationElement)).call(this, parameters, true));
var file = _this21.data.file;
_this21.filename = (0, _dom_utils.getFilenameFromUrl)(file.filename);
_this21.content = file.content;
_this21.linkService.onFileAttachmentAnnotation({
var file = _this22.data.file;
_this22.filename = (0, _dom_utils.getFilenameFromUrl)(file.filename);
_this22.content = file.content;
_this22.linkService.onFileAttachmentAnnotation({
id: (0, _util.stringToPDFString)(file.filename),
filename: file.filename,
content: file.content
});
return _this21;
return _this22;
}
_createClass(FileAttachmentAnnotationElement, [{
@ -7360,8 +7382,8 @@ exports.SVGGraphics = SVGGraphics; @@ -7360,8 +7382,8 @@ exports.SVGGraphics = SVGGraphics;
"use strict";
var pdfjsVersion = '2.0.161';
var pdfjsBuild = 'b32d659d';
var pdfjsVersion = '2.0.163';
var pdfjsBuild = '3e34eb31';
var pdfjsSharedUtil = __w_pdfjs_require__(0);
var pdfjsDisplayGlobal = __w_pdfjs_require__(112);
var pdfjsDisplayAPI = __w_pdfjs_require__(57);
@ -12690,8 +12712,8 @@ if (!_global_scope2.default.PDFJS) { @@ -12690,8 +12712,8 @@ if (!_global_scope2.default.PDFJS) {
}
var PDFJS = _global_scope2.default.PDFJS;
{
PDFJS.version = '2.0.161';
PDFJS.build = 'b32d659d';
PDFJS.version = '2.0.163';
PDFJS.build = '3e34eb31';
}
PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) {

2
build/pdf.js.map

File diff suppressed because one or more lines are too long

2
build/pdf.min.js vendored

File diff suppressed because one or more lines are too long

59
build/pdf.worker.js vendored

@ -21883,8 +21883,8 @@ exports.PostScriptCompiler = PostScriptCompiler; @@ -21883,8 +21883,8 @@ exports.PostScriptCompiler = PostScriptCompiler;
"use strict";
var pdfjsVersion = '2.0.161';
var pdfjsBuild = 'b32d659d';
var pdfjsVersion = '2.0.163';
var pdfjsBuild = '3e34eb31';
var pdfjsCoreWorker = __w_pdfjs_require__(72);
exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;
@ -22089,7 +22089,7 @@ var WorkerMessageHandler = { @@ -22089,7 +22089,7 @@ var WorkerMessageHandler = {
var cancelXHRs = null;
var WorkerTasks = [];
var apiVersion = docParams.apiVersion;
var workerVersion = '2.0.161';
var workerVersion = '2.0.163';
if (apiVersion !== null && apiVersion !== workerVersion) {
throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".'));
}
@ -31949,40 +31949,69 @@ var ButtonWidgetAnnotation = function (_WidgetAnnotation2) { @@ -31949,40 +31949,69 @@ var ButtonWidgetAnnotation = function (_WidgetAnnotation2) {
var _this4 = _possibleConstructorReturn(this, (ButtonWidgetAnnotation.__proto__ || Object.getPrototypeOf(ButtonWidgetAnnotation)).call(this, params));
_this4.data.checkBox = !_this4.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !_this4.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
_this4.data.radioButton = _this4.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !_this4.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
_this4.data.pushButton = _this4.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
if (_this4.data.checkBox) {
if (!(0, _primitives.isName)(_this4.data.fieldValue)) {
return _possibleConstructorReturn(_this4);
_this4._processCheckBox();
} else if (_this4.data.radioButton) {
_this4._processRadioButton(params);
} else if (_this4.data.pushButton) {
_this4._processPushButton(params);
} else {
(0, _util.warn)('Invalid field flags for button widget annotation');
}
return _this4;
}
_createClass(ButtonWidgetAnnotation, [{
key: '_processCheckBox',
value: function _processCheckBox() {
if (!(0, _primitives.isName)(this.data.fieldValue)) {
return;
}
_this4.data.fieldValue = _this4.data.fieldValue.name;
this.data.fieldValue = this.data.fieldValue.name;
}
_this4.data.radioButton = _this4.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !_this4.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
if (_this4.data.radioButton) {
_this4.data.fieldValue = _this4.data.buttonValue = null;
}, {
key: '_processRadioButton',
value: function _processRadioButton(params) {
this.data.fieldValue = this.data.buttonValue = null;
var fieldParent = params.dict.get('Parent');
if ((0, _primitives.isDict)(fieldParent) && fieldParent.has('V')) {
var fieldParentValue = fieldParent.get('V');
if ((0, _primitives.isName)(fieldParentValue)) {
_this4.data.fieldValue = fieldParentValue.name;
this.data.fieldValue = fieldParentValue.name;
}
}
var appearanceStates = params.dict.get('AP');
if (!(0, _primitives.isDict)(appearanceStates)) {
return _possibleConstructorReturn(_this4);
return;
}
var normalAppearanceState = appearanceStates.get('N');
if (!(0, _primitives.isDict)(normalAppearanceState)) {
return _possibleConstructorReturn(_this4);
return;
}
var keys = normalAppearanceState.getKeys();
for (var i = 0, ii = keys.length; i < ii; i++) {
if (keys[i] !== 'Off') {
_this4.data.buttonValue = keys[i];
this.data.buttonValue = keys[i];
break;
}
}
}
return _this4;
}
}, {
key: '_processPushButton',
value: function _processPushButton(params) {
if (!params.dict.has('A')) {
(0, _util.warn)('Push buttons without action dictionaries are not supported');
return;
}
_obj.Catalog.parseDestDictionary({
destDict: params.dict,
resultObj: this.data,
docBaseUrl: params.pdfManager.docBaseUrl
});
}
}]);
return ButtonWidgetAnnotation;
}(WidgetAnnotation);

2
build/pdf.worker.js.map vendored

File diff suppressed because one or more lines are too long

2
build/pdf.worker.min.js vendored

File diff suppressed because one or more lines are too long

53
lib/core/annotation.js

@ -561,40 +561,69 @@ var ButtonWidgetAnnotation = function (_WidgetAnnotation2) { @@ -561,40 +561,69 @@ var ButtonWidgetAnnotation = function (_WidgetAnnotation2) {
var _this4 = _possibleConstructorReturn(this, (ButtonWidgetAnnotation.__proto__ || Object.getPrototypeOf(ButtonWidgetAnnotation)).call(this, params));
_this4.data.checkBox = !_this4.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !_this4.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
_this4.data.radioButton = _this4.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !_this4.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
_this4.data.pushButton = _this4.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
if (_this4.data.checkBox) {
if (!(0, _primitives.isName)(_this4.data.fieldValue)) {
return _possibleConstructorReturn(_this4);
_this4._processCheckBox();
} else if (_this4.data.radioButton) {
_this4._processRadioButton(params);
} else if (_this4.data.pushButton) {
_this4._processPushButton(params);
} else {
(0, _util.warn)('Invalid field flags for button widget annotation');
}
return _this4;
}
_createClass(ButtonWidgetAnnotation, [{
key: '_processCheckBox',
value: function _processCheckBox() {
if (!(0, _primitives.isName)(this.data.fieldValue)) {
return;
}
_this4.data.fieldValue = _this4.data.fieldValue.name;
this.data.fieldValue = this.data.fieldValue.name;
}
_this4.data.radioButton = _this4.hasFieldFlag(_util.AnnotationFieldFlag.RADIO) && !_this4.hasFieldFlag(_util.AnnotationFieldFlag.PUSHBUTTON);
if (_this4.data.radioButton) {
_this4.data.fieldValue = _this4.data.buttonValue = null;
}, {
key: '_processRadioButton',
value: function _processRadioButton(params) {
this.data.fieldValue = this.data.buttonValue = null;
var fieldParent = params.dict.get('Parent');
if ((0, _primitives.isDict)(fieldParent) && fieldParent.has('V')) {
var fieldParentValue = fieldParent.get('V');
if ((0, _primitives.isName)(fieldParentValue)) {
_this4.data.fieldValue = fieldParentValue.name;
this.data.fieldValue = fieldParentValue.name;
}
}
var appearanceStates = params.dict.get('AP');
if (!(0, _primitives.isDict)(appearanceStates)) {
return _possibleConstructorReturn(_this4);
return;
}
var normalAppearanceState = appearanceStates.get('N');
if (!(0, _primitives.isDict)(normalAppearanceState)) {
return _possibleConstructorReturn(_this4);
return;
}
var keys = normalAppearanceState.getKeys();
for (var i = 0, ii = keys.length; i < ii; i++) {
if (keys[i] !== 'Off') {
_this4.data.buttonValue = keys[i];
this.data.buttonValue = keys[i];
break;
}
}
}
return _this4;
}
}, {
key: '_processPushButton',
value: function _processPushButton(params) {
if (!params.dict.has('A')) {
(0, _util.warn)('Push buttons without action dictionaries are not supported');
return;
}
_obj.Catalog.parseDestDictionary({
destDict: params.dict,
resultObj: this.data,
docBaseUrl: params.pdfManager.docBaseUrl
});
}
}]);
return ButtonWidgetAnnotation;
}(WidgetAnnotation);

2
lib/core/worker.js

@ -208,7 +208,7 @@ var WorkerMessageHandler = { @@ -208,7 +208,7 @@ var WorkerMessageHandler = {
var cancelXHRs = null;
var WorkerTasks = [];
var apiVersion = docParams.apiVersion;
var workerVersion = '2.0.161';
var workerVersion = '2.0.163';
if (apiVersion !== null && apiVersion !== workerVersion) {
throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".'));
}

54
lib/display/annotation_layer.js

@ -19,6 +19,8 @@ Object.defineProperty(exports, "__esModule", { @@ -19,6 +19,8 @@ Object.defineProperty(exports, "__esModule", {
});
exports.AnnotationLayer = undefined;
var _get = function get(object, property, receiver) { if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { return get(parent, property, receiver); } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } };
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
var _dom_utils = require('./dom_utils');
@ -56,8 +58,7 @@ var AnnotationElementFactory = function () { @@ -56,8 +58,7 @@ var AnnotationElementFactory = function () {
} else if (parameters.data.checkBox) {
return new CheckboxWidgetAnnotationElement(parameters);
}
(0, _util.warn)('Unimplemented button widget annotation: pushbutton');
break;
return new PushButtonWidgetAnnotationElement(parameters);
case 'Ch':
return new ChoiceWidgetAnnotationElement(parameters);
}
@ -446,6 +447,27 @@ var RadioButtonWidgetAnnotationElement = function (_WidgetAnnotationElem3) { @@ -446,6 +447,27 @@ var RadioButtonWidgetAnnotationElement = function (_WidgetAnnotationElem3) {
return RadioButtonWidgetAnnotationElement;
}(WidgetAnnotationElement);
var PushButtonWidgetAnnotationElement = function (_LinkAnnotationElemen) {
_inherits(PushButtonWidgetAnnotationElement, _LinkAnnotationElemen);
function PushButtonWidgetAnnotationElement() {
_classCallCheck(this, PushButtonWidgetAnnotationElement);
return _possibleConstructorReturn(this, (PushButtonWidgetAnnotationElement.__proto__ || Object.getPrototypeOf(PushButtonWidgetAnnotationElement)).apply(this, arguments));
}
_createClass(PushButtonWidgetAnnotationElement, [{
key: 'render',
value: function render() {
var container = _get(PushButtonWidgetAnnotationElement.prototype.__proto__ || Object.getPrototypeOf(PushButtonWidgetAnnotationElement.prototype), 'render', this).call(this);
container.className = 'buttonWidgetAnnotation pushButton';
return container;
}
}]);
return PushButtonWidgetAnnotationElement;
}(LinkAnnotationElement);
var ChoiceWidgetAnnotationElement = function (_WidgetAnnotationElem4) {
_inherits(ChoiceWidgetAnnotationElement, _WidgetAnnotationElem4);
@ -740,11 +762,11 @@ var PolylineAnnotationElement = function (_AnnotationElement8) { @@ -740,11 +762,11 @@ var PolylineAnnotationElement = function (_AnnotationElement8) {
var isRenderable = !!(parameters.data.hasPopup || parameters.data.title || parameters.data.contents);
var _this14 = _possibleConstructorReturn(this, (PolylineAnnotationElement.__proto__ || Object.getPrototypeOf(PolylineAnnotationElement)).call(this, parameters, isRenderable, true));
var _this15 = _possibleConstructorReturn(this, (PolylineAnnotationElement.__proto__ || Object.getPrototypeOf(PolylineAnnotationElement)).call(this, parameters, isRenderable, true));
_this14.containerClassName = 'polylineAnnotation';
_this14.svgElementName = 'svg:polyline';
return _this14;
_this15.containerClassName = 'polylineAnnotation';
_this15.svgElementName = 'svg:polyline';
return _this15;
}
_createClass(PolylineAnnotationElement, [{
@ -785,11 +807,11 @@ var PolygonAnnotationElement = function (_PolylineAnnotationEl) { @@ -785,11 +807,11 @@ var PolygonAnnotationElement = function (_PolylineAnnotationEl) {
function PolygonAnnotationElement(parameters) {
_classCallCheck(this, PolygonAnnotationElement);
var _this15 = _possibleConstructorReturn(this, (PolygonAnnotationElement.__proto__ || Object.getPrototypeOf(PolygonAnnotationElement)).call(this, parameters));
var _this16 = _possibleConstructorReturn(this, (PolygonAnnotationElement.__proto__ || Object.getPrototypeOf(PolygonAnnotationElement)).call(this, parameters));
_this15.containerClassName = 'polygonAnnotation';
_this15.svgElementName = 'svg:polygon';
return _this15;
_this16.containerClassName = 'polygonAnnotation';
_this16.svgElementName = 'svg:polygon';
return _this16;
}
return PolygonAnnotationElement;
@ -921,17 +943,17 @@ var FileAttachmentAnnotationElement = function (_AnnotationElement14) { @@ -921,17 +943,17 @@ var FileAttachmentAnnotationElement = function (_AnnotationElement14) {
function FileAttachmentAnnotationElement(parameters) {
_classCallCheck(this, FileAttachmentAnnotationElement);
var _this21 = _possibleConstructorReturn(this, (FileAttachmentAnnotationElement.__proto__ || Object.getPrototypeOf(FileAttachmentAnnotationElement)).call(this, parameters, true));
var _this22 = _possibleConstructorReturn(this, (FileAttachmentAnnotationElement.__proto__ || Object.getPrototypeOf(FileAttachmentAnnotationElement)).call(this, parameters, true));
var file = _this21.data.file;
_this21.filename = (0, _dom_utils.getFilenameFromUrl)(file.filename);
_this21.content = file.content;
_this21.linkService.onFileAttachmentAnnotation({
var file = _this22.data.file;
_this22.filename = (0, _dom_utils.getFilenameFromUrl)(file.filename);
_this22.content = file.content;
_this22.linkService.onFileAttachmentAnnotation({
id: (0, _util.stringToPDFString)(file.filename),
filename: file.filename,
content: file.content
});
return _this21;
return _this22;
}
_createClass(FileAttachmentAnnotationElement, [{

6
lib/display/api.js

@ -171,7 +171,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) { @@ -171,7 +171,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
if (worker.destroyed) {
return Promise.reject(new Error('Worker was destroyed'));
}
var apiVersion = '2.0.161';
var apiVersion = '2.0.163';
source.disableRange = (0, _dom_utils.getDefaultSetting)('disableRange');
source.disableAutoFetch = (0, _dom_utils.getDefaultSetting)('disableAutoFetch');
source.disableStream = (0, _dom_utils.getDefaultSetting)('disableStream');
@ -1532,8 +1532,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() { @@ -1532,8 +1532,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
}();
var version, build;
{
exports.version = version = '2.0.161';
exports.build = build = 'b32d659d';
exports.version = version = '2.0.163';
exports.build = build = '3e34eb31';
}
exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort;

4
lib/display/global.js

@ -44,8 +44,8 @@ if (!_global_scope2.default.PDFJS) { @@ -44,8 +44,8 @@ if (!_global_scope2.default.PDFJS) {
}
var PDFJS = _global_scope2.default.PDFJS;
{
PDFJS.version = '2.0.161';
PDFJS.build = 'b32d659d';
PDFJS.version = '2.0.163';
PDFJS.build = '3e34eb31';
}
PDFJS.pdfBug = false;
if (PDFJS.verbosity !== undefined) {

4
lib/pdf.js

@ -14,8 +14,8 @@ @@ -14,8 +14,8 @@
*/
'use strict';
var pdfjsVersion = '2.0.161';
var pdfjsBuild = 'b32d659d';
var pdfjsVersion = '2.0.163';
var pdfjsBuild = '3e34eb31';
var pdfjsSharedUtil = require('./shared/util.js');
var pdfjsDisplayGlobal = require('./display/global.js');
var pdfjsDisplayAPI = require('./display/api.js');

4
lib/pdf.worker.js vendored

@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
*/
'use strict';
var pdfjsVersion = '2.0.161';
var pdfjsBuild = 'b32d659d';
var pdfjsVersion = '2.0.163';
var pdfjsBuild = '3e34eb31';
var pdfjsCoreWorker = require('./core/worker.js');
exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;

2
package.json

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
{
"name": "pdfjs-dist",
"version": "2.0.161",
"version": "2.0.163",
"main": "build/pdf.js",
"description": "Generic build of Mozilla's PDF.js library.",
"keywords": [

12
web/pdf_viewer.css

@ -86,7 +86,8 @@ @@ -86,7 +86,8 @@
position: absolute;
}
.annotationLayer .linkAnnotation > a {
.annotationLayer .linkAnnotation > a,
.annotationLayer .buttonWidgetAnnotation.pushButton > a {
position: absolute;
font-size: 1em;
top: 0;
@ -95,11 +96,16 @@ @@ -95,11 +96,16 @@
height: 100%;
}
.annotationLayer .linkAnnotation > a /* -ms-a */ {
.annotationLayer .linkAnnotation > a /* -ms-a */ {
background: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7") 0 0 repeat;
}
.annotationLayer .linkAnnotation > a:hover {
.annotationLayer .buttonWidgetAnnotation.pushButton > a /* -ms-a */ {
background: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7") 0 0 repeat;
}
.annotationLayer .linkAnnotation > a:hover,
.annotationLayer .buttonWidgetAnnotation.pushButton > a:hover {
opacity: 0.2;
background: #ff0;
box-shadow: 0px 2px 10px #ff0;

Loading…
Cancel
Save