Skip to content
This repository has been archived by the owner on Jul 14, 2024. It is now read-only.

Commit

Permalink
PDF.js version 2.0.457 - See mozilla/pdf.js@5c1a16b
Browse files Browse the repository at this point in the history
  • Loading branch information
pdfjsbot committed Mar 25, 2018
1 parent 4c5b764 commit 1f0cfc0
Show file tree
Hide file tree
Showing 19 changed files with 134 additions and 86 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pdfjs-dist",
"version": "2.0.455",
"version": "2.0.457",
"main": [
"build/pdf.js",
"build/pdf.worker.js"
Expand Down
25 changes: 5 additions & 20 deletions build/pdf.js
Original file line number Diff line number Diff line change
Expand Up @@ -3004,8 +3004,8 @@ exports.GlobalWorkerOptions = GlobalWorkerOptions;
"use strict";


var pdfjsVersion = '2.0.455';
var pdfjsBuild = '6cc0efe1';
var pdfjsVersion = '2.0.457';
var pdfjsBuild = '5c1a16ba';
var pdfjsSharedUtil = __w_pdfjs_require__(0);
var pdfjsDisplayAPI = __w_pdfjs_require__(117);
var pdfjsDisplayTextLayer = __w_pdfjs_require__(125);
Expand Down Expand Up @@ -8230,8 +8230,6 @@ exports.build = exports.version = exports.setPDFNetworkStreamFactory = exports.P

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 _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();

var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };

var _util = __w_pdfjs_require__(0);
Expand Down Expand Up @@ -8436,7 +8434,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
}
return worker.messageHandler.sendWithPromise('GetDocRequest', {
docId: docId,
apiVersion: '2.0.455',
apiVersion: '2.0.457',
source: {
data: source.data,
url: source.url,
Expand Down Expand Up @@ -8650,19 +8648,6 @@ var PDFPageProxy = function PDFPageProxyClosure() {
get view() {
return this.pageInfo.view;
},
get pageSizeInches() {
var _view = _slicedToArray(this.view, 4),
x1 = _view[0],
y1 = _view[1],
x2 = _view[2],
y2 = _view[3],
userUnit = this.userUnit;

return {
width: (x2 - x1) / 72 * userUnit,
height: (y2 - y1) / 72 * userUnit
};
},
getViewport: function getViewport(scale) {
var rotate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.rotate;
var dontFlip = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
Expand Down Expand Up @@ -9867,8 +9852,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
}();
var version, build;
{
exports.version = version = '2.0.455';
exports.build = build = '6cc0efe1';
exports.version = version = '2.0.457';
exports.build = build = '5c1a16ba';
}
exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort;
Expand Down
2 changes: 1 addition & 1 deletion build/pdf.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/pdf.min.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions build/pdf.worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -22361,8 +22361,8 @@ exports.PostScriptCompiler = PostScriptCompiler;
"use strict";


var pdfjsVersion = '2.0.455';
var pdfjsBuild = '6cc0efe1';
var pdfjsVersion = '2.0.457';
var pdfjsBuild = '5c1a16ba';
var pdfjsCoreWorker = __w_pdfjs_require__(74);
exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;

Expand Down Expand Up @@ -22575,7 +22575,7 @@ var WorkerMessageHandler = {
var cancelXHRs = null;
var WorkerTasks = [];
var apiVersion = docParams.apiVersion;
var workerVersion = '2.0.455';
var workerVersion = '2.0.457';
if (apiVersion !== null && apiVersion !== workerVersion) {
throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".'));
}
Expand Down
2 changes: 1 addition & 1 deletion build/pdf.worker.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/pdf.worker.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/core/worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ var WorkerMessageHandler = {
var cancelXHRs = null;
var WorkerTasks = [];
var apiVersion = docParams.apiVersion;
var workerVersion = '2.0.455';
var workerVersion = '2.0.457';
if (apiVersion !== null && apiVersion !== workerVersion) {
throw new Error('The API version "' + apiVersion + '" does not match ' + ('the Worker version "' + workerVersion + '".'));
}
Expand Down
21 changes: 3 additions & 18 deletions lib/display/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ exports.build = exports.version = exports.setPDFNetworkStreamFactory = exports.P

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 _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();

var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };

var _util = require('../shared/util');
Expand Down Expand Up @@ -234,7 +232,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
}
return worker.messageHandler.sendWithPromise('GetDocRequest', {
docId: docId,
apiVersion: '2.0.455',
apiVersion: '2.0.457',
source: {
data: source.data,
url: source.url,
Expand Down Expand Up @@ -448,19 +446,6 @@ var PDFPageProxy = function PDFPageProxyClosure() {
get view() {
return this.pageInfo.view;
},
get pageSizeInches() {
var _view = _slicedToArray(this.view, 4),
x1 = _view[0],
y1 = _view[1],
x2 = _view[2],
y2 = _view[3],
userUnit = this.userUnit;

return {
width: (x2 - x1) / 72 * userUnit,
height: (y2 - y1) / 72 * userUnit
};
},
getViewport: function getViewport(scale) {
var rotate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.rotate;
var dontFlip = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
Expand Down Expand Up @@ -1665,8 +1650,8 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
}();
var version, build;
{
exports.version = version = '2.0.455';
exports.build = build = '6cc0efe1';
exports.version = version = '2.0.457';
exports.build = build = '5c1a16ba';
}
exports.getDocument = getDocument;
exports.LoopbackPort = LoopbackPort;
Expand Down
4 changes: 2 additions & 2 deletions lib/pdf.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
*/
'use strict';

var pdfjsVersion = '2.0.455';
var pdfjsBuild = '6cc0efe1';
var pdfjsVersion = '2.0.457';
var pdfjsBuild = '5c1a16ba';
var pdfjsSharedUtil = require('./shared/util.js');
var pdfjsDisplayAPI = require('./display/api.js');
var pdfjsDisplayTextLayer = require('./display/text_layer.js');
Expand Down
4 changes: 2 additions & 2 deletions lib/pdf.worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/
'use strict';

var pdfjsVersion = '2.0.455';
var pdfjsBuild = '6cc0efe1';
var pdfjsVersion = '2.0.457';
var pdfjsBuild = '5c1a16ba';
var pdfjsCoreWorker = require('./core/worker.js');
exports.WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;
8 changes: 0 additions & 8 deletions lib/test/unit/api_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -845,14 +845,6 @@ describe('api', function () {
it('gets view', function () {
expect(page.view).toEqual([0, 0, 595.28, 841.89]);
});
it('gets page size (in inches)', function () {
var _page$pageSizeInches = page.pageSizeInches,
width = _page$pageSizeInches.width,
height = _page$pageSizeInches.height;

expect(+width.toPrecision(3)).toEqual(8.27);
expect(+height.toPrecision(4)).toEqual(11.69);
});
it('gets viewport', function () {
var viewport = page.getViewport(1.5, 90);
expect(viewport.viewBox).toEqual(page.view);
Expand Down
42 changes: 42 additions & 0 deletions lib/test/unit/ui_utils_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -318,4 +318,46 @@ describe('ui_utils', function () {
}, done.fail);
});
});
describe('getPageSizeInches', function () {
it('gets page size (in inches)', function () {
var page = {
view: [0, 0, 595.28, 841.89],
userUnit: 1.0,
rotate: 0
};

var _getPageSizeInches = (0, _ui_utils.getPageSizeInches)(page),
width = _getPageSizeInches.width,
height = _getPageSizeInches.height;

expect(+width.toPrecision(3)).toEqual(8.27);
expect(+height.toPrecision(4)).toEqual(11.69);
});
it('gets page size (in inches), for non-default /Rotate entry', function () {
var pdfPage1 = {
view: [0, 0, 612, 792],
userUnit: 1,
rotate: 0
};

var _getPageSizeInches2 = (0, _ui_utils.getPageSizeInches)(pdfPage1),
width1 = _getPageSizeInches2.width,
height1 = _getPageSizeInches2.height;

expect(width1).toEqual(8.5);
expect(height1).toEqual(11);
var pdfPage2 = {
view: [0, 0, 612, 792],
userUnit: 1,
rotate: 90
};

var _getPageSizeInches3 = (0, _ui_utils.getPageSizeInches)(pdfPage2),
width2 = _getPageSizeInches3.width,
height2 = _getPageSizeInches3.height;

expect(width2).toEqual(11);
expect(height2).toEqual(8.5);
});
});
});
2 changes: 1 addition & 1 deletion lib/web/pdf_document_properties.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ var PDFDocumentProperties = function () {
contentDispositionFilename = _ref2.contentDispositionFilename;

return Promise.all([info, metadata, contentDispositionFilename || (0, _ui_utils.getPDFFileNameFromURL)(_this2.url), _this2._parseFileSize(_this2.maybeFileSize), _this2._parseDate(info.CreationDate), _this2._parseDate(info.ModDate), _this2.pdfDocument.getPage(currentPageNumber).then(function (pdfPage) {
return _this2._parsePageSize(pdfPage.pageSizeInches);
return _this2._parsePageSize((0, _ui_utils.getPageSizeInches)(pdfPage));
})]);
}).then(function (_ref3) {
var _ref4 = _slicedToArray(_ref3, 7),
Expand Down
4 changes: 2 additions & 2 deletions lib/web/pdf_viewer.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ var _pdf_single_page_viewer = require('./pdf_single_page_viewer');

var _pdf_viewer = require('./pdf_viewer.js');

var pdfjsVersion = '2.0.455';
var pdfjsBuild = '6cc0efe1';
var pdfjsVersion = '2.0.457';
var pdfjsBuild = '5c1a16ba';
exports.PDFViewer = _pdf_viewer.PDFViewer;
exports.PDFSinglePageViewer = _pdf_single_page_viewer.PDFSinglePageViewer;
exports.PDFPageView = _pdf_page_view.PDFPageView;
Expand Down
42 changes: 32 additions & 10 deletions lib/web/ui_utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
exports.waitOnEventOrTimeout = exports.WaitOnType = exports.animationStarted = exports.normalizeWheelEventDelta = exports.binarySearchFirstItem = exports.watchScroll = exports.scrollIntoView = exports.getOutputScale = exports.approximateFraction = exports.roundToDivide = exports.getVisibleElements = exports.parseQueryString = exports.noContextMenuHandler = exports.getPDFFileNameFromURL = exports.ProgressBar = exports.EventBus = exports.NullL10n = exports.TextLayerMode = exports.RendererType = exports.PresentationModeState = exports.cloneObj = exports.isFileSchema = exports.isValidRotation = exports.VERTICAL_PADDING = exports.SCROLLBAR_PADDING = exports.MAX_AUTO_SCALE = exports.UNKNOWN_SCALE = exports.MAX_SCALE = exports.MIN_SCALE = exports.DEFAULT_SCALE = exports.DEFAULT_SCALE_VALUE = exports.CSS_UNITS = undefined;
exports.waitOnEventOrTimeout = exports.WaitOnType = exports.animationStarted = exports.normalizeWheelEventDelta = exports.binarySearchFirstItem = exports.watchScroll = exports.scrollIntoView = exports.getOutputScale = exports.approximateFraction = exports.getPageSizeInches = exports.roundToDivide = exports.getVisibleElements = exports.parseQueryString = exports.noContextMenuHandler = exports.getPDFFileNameFromURL = exports.ProgressBar = exports.EventBus = exports.NullL10n = exports.TextLayerMode = exports.RendererType = exports.PresentationModeState = exports.cloneObj = exports.isFileSchema = exports.isValidRotation = exports.VERTICAL_PADDING = exports.SCROLLBAR_PADDING = exports.MAX_AUTO_SCALE = exports.UNKNOWN_SCALE = exports.MAX_SCALE = exports.MIN_SCALE = exports.DEFAULT_SCALE = exports.DEFAULT_SCALE_VALUE = exports.CSS_UNITS = undefined;

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 _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };

var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();

var _pdf = require('../pdf');

function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
Expand Down Expand Up @@ -218,6 +220,25 @@ function roundToDivide(x, div) {
var r = x % div;
return r === 0 ? x : Math.round(x - r + div);
}
function getPageSizeInches(_ref) {
var view = _ref.view,
userUnit = _ref.userUnit,
rotate = _ref.rotate;

var _view = _slicedToArray(view, 4),
x1 = _view[0],
y1 = _view[1],
x2 = _view[2],
y2 = _view[3];

var changeOrientation = rotate % 180 !== 0;
var width = (x2 - x1) / 72 * userUnit;
var height = (y2 - y1) / 72 * userUnit;
return {
width: changeOrientation ? height : width,
height: changeOrientation ? width : height
};
}
function getVisibleElements(scrollEl, views) {
var sortByVisibility = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;

Expand Down Expand Up @@ -353,11 +374,11 @@ var WaitOnType = {
EVENT: 'event',
TIMEOUT: 'timeout'
};
function waitOnEventOrTimeout(_ref) {
var target = _ref.target,
name = _ref.name,
_ref$delay = _ref.delay,
delay = _ref$delay === undefined ? 0 : _ref$delay;
function waitOnEventOrTimeout(_ref2) {
var target = _ref2.target,
name = _ref2.name,
_ref2$delay = _ref2.delay,
delay = _ref2$delay === undefined ? 0 : _ref2$delay;

if ((typeof target === 'undefined' ? 'undefined' : _typeof(target)) !== 'object' || !(name && typeof name === 'string') || !(Number.isInteger(delay) && delay >= 0)) {
return Promise.reject(new Error('waitOnEventOrTimeout - invalid paramaters.'));
Expand Down Expand Up @@ -438,10 +459,10 @@ function clamp(v, min, max) {

var ProgressBar = function () {
function ProgressBar(id) {
var _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
height = _ref2.height,
width = _ref2.width,
units = _ref2.units;
var _ref3 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
height = _ref3.height,
width = _ref3.width,
units = _ref3.units;

_classCallCheck(this, ProgressBar);

Expand Down Expand Up @@ -537,6 +558,7 @@ exports.noContextMenuHandler = noContextMenuHandler;
exports.parseQueryString = parseQueryString;
exports.getVisibleElements = getVisibleElements;
exports.roundToDivide = roundToDivide;
exports.getPageSizeInches = getPageSizeInches;
exports.approximateFraction = approximateFraction;
exports.getOutputScale = getOutputScale;
exports.scrollIntoView = scrollIntoView;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pdfjs-dist",
"version": "2.0.455",
"version": "2.0.457",
"main": "build/pdf.js",
"description": "Generic build of Mozilla's PDF.js library.",
"keywords": [
Expand Down
Loading

0 comments on commit 1f0cfc0

Please sign in to comment.