Skip to content

Commit

Permalink
PDF.js version 1.3.122 - See mozilla/pdf.js@05b9d37
Browse files Browse the repository at this point in the history
  • Loading branch information
pdfjsbot committed Dec 21, 2015
1 parent f65fdc7 commit a7cd5f7
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 24 deletions.
2 changes: 1 addition & 1 deletion bower.json
@@ -1,6 +1,6 @@
{
"name": "pdfjs-dist",
"version": "1.3.120",
"version": "1.3.122",
"main": [
"build/pdf.js",
"build/pdf.worker.js"
Expand Down
21 changes: 13 additions & 8 deletions build/pdf.combined.js
Expand Up @@ -12,16 +12,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*jshint globalstrict: false */
/* globals PDFJS */
/* jshint globalstrict: false */
/* globals PDFJS, global */

// Initializing PDFJS global object (if still undefined)
if (typeof PDFJS === 'undefined') {
(typeof window !== 'undefined' ? window : this).PDFJS = {};
(typeof window !== 'undefined' ? window :
typeof global !== 'undefined' ? global : this).PDFJS = {};
}

PDFJS.version = '1.3.120';
PDFJS.build = 'eb557d2';
PDFJS.version = '1.3.122';
PDFJS.build = '05b9d37';

(function pdfjsWrapper() {
// Use strict in our context only - users might not want it
Expand Down Expand Up @@ -6155,6 +6156,7 @@ var globalScope = sharedGlobal.globalScope;

var DEFAULT_RANGE_CHUNK_SIZE = 65536; // 2^16 = 65536


/**
* The maximum allowed image size in total pixels e.g. width * height. Images
* above this value will not be drawn. Use -1 for no limit.
Expand Down Expand Up @@ -7314,8 +7316,10 @@ var PDFWorker = (function PDFWorkerClosure() {
},

_setupFakeWorker: function PDFWorker_setupFakeWorker() {
warn('Setting up fake worker.');
globalScope.PDFJS.disableWorker = true;
if (!globalScope.PDFJS.disableWorker) {
warn('Setting up fake worker.');
globalScope.PDFJS.disableWorker = true;
}

setupFakeWorkerGlobal().then(function () {
if (this.destroyed) {
Expand Down Expand Up @@ -48509,7 +48513,8 @@ var workerConsole = {


// Worker thread?
if (typeof window === 'undefined' && typeof require === 'undefined') {
if (typeof window === 'undefined' &&
!(typeof module !== 'undefined' && module.require)) {
if (!('console' in globalScope)) {
globalScope.console = workerConsole;
}
Expand Down
45 changes: 37 additions & 8 deletions build/pdf.js
Expand Up @@ -12,16 +12,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*jshint globalstrict: false */
/* globals PDFJS */
/* jshint globalstrict: false */
/* globals PDFJS, global */

// Initializing PDFJS global object (if still undefined)
if (typeof PDFJS === 'undefined') {
(typeof window !== 'undefined' ? window : this).PDFJS = {};
(typeof window !== 'undefined' ? window :
typeof global !== 'undefined' ? global : this).PDFJS = {};
}

PDFJS.version = '1.3.120';
PDFJS.build = 'eb557d2';
PDFJS.version = '1.3.122';
PDFJS.build = '05b9d37';

(function pdfjsWrapper() {
// Use strict in our context only - users might not want it
Expand Down Expand Up @@ -6156,6 +6157,29 @@ var globalScope = sharedGlobal.globalScope;

var DEFAULT_RANGE_CHUNK_SIZE = 65536; // 2^16 = 65536


var useRequireEnsure = false;
if (typeof module !== 'undefined' && module.require) {
// node.js - disable worker and set require.ensure.
PDFJS.disableWorker = true;
if (typeof require.ensure === 'undefined') {
require.ensure = require('node-ensure');
}
useRequireEnsure = true;
}
if (typeof __webpack_require__ !== 'undefined') {
// Webpack - get/bundle pdf.worker.js as additional file.
PDFJS.workerSrc = require('entry?name=[hash]-worker.js!./pdf.worker.js');
useRequireEnsure = true;
}
var fakeWorkerFilesLoader = useRequireEnsure && function (callback) {
require.ensure([], function () {
require('./pdf.worker.js');
callback();
});
};


/**
* The maximum allowed image size in total pixels e.g. width * height. Images
* above this value will not be drawn. Use -1 for no limit.
Expand Down Expand Up @@ -7274,7 +7298,10 @@ var PDFWorker = (function PDFWorkerClosure() {
// In the developer build load worker_loader which in turn loads all the
// other files and resolves the promise. In production only the
// pdf.worker.js file is needed.
Util.loadScript(PDFJS.workerSrc, function() {
var loader = fakeWorkerFilesLoader || function (callback) {
Util.loadScript(PDFJS.workerSrc, callback);
};
loader(function () {
PDFJS.fakeWorkerFilesLoadedCapability.resolve();
});
}
Expand Down Expand Up @@ -7374,8 +7401,10 @@ var PDFWorker = (function PDFWorkerClosure() {
},

_setupFakeWorker: function PDFWorker_setupFakeWorker() {
warn('Setting up fake worker.');
globalScope.PDFJS.disableWorker = true;
if (!globalScope.PDFJS.disableWorker) {
warn('Setting up fake worker.');
globalScope.PDFJS.disableWorker = true;
}

setupFakeWorkerGlobal().then(function () {
if (this.destroyed) {
Expand Down
14 changes: 8 additions & 6 deletions build/pdf.worker.js
Expand Up @@ -12,16 +12,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*jshint globalstrict: false */
/* globals PDFJS */
/* jshint globalstrict: false */
/* globals PDFJS, global */

// Initializing PDFJS global object (if still undefined)
if (typeof PDFJS === 'undefined') {
(typeof window !== 'undefined' ? window : this).PDFJS = {};
(typeof window !== 'undefined' ? window :
typeof global !== 'undefined' ? global : this).PDFJS = {};
}

PDFJS.version = '1.3.120';
PDFJS.build = 'eb557d2';
PDFJS.version = '1.3.122';
PDFJS.build = '05b9d37';

(function pdfjsWrapper() {
// Use strict in our context only - users might not want it
Expand Down Expand Up @@ -40929,7 +40930,8 @@ var workerConsole = {


// Worker thread?
if (typeof window === 'undefined' && typeof require === 'undefined') {
if (typeof window === 'undefined' &&
!(typeof module !== 'undefined' && module.require)) {
if (!('console' in globalScope)) {
globalScope.console = workerConsole;
}
Expand Down
3 changes: 2 additions & 1 deletion package.json
@@ -1,6 +1,7 @@
{
"name": "pdfjs-dist",
"version": "1.3.120",
"version": "1.3.122",
"main": "build/pdf.js",
"description": "Generic build of Mozilla's PDF.js library.",
"keywords": [
"Mozilla",
Expand Down

0 comments on commit a7cd5f7

Please sign in to comment.