Merge pull request #8262 from tcorral/master

yurydelendik · web-flow · commit ad1023ff5571 · 2017-04-13T10:41:36.000-05:00
Fix worker resolution on using minified version
diff --git a/src/display/api.js b/src/display/api.js
@@ -1097,7 +1097,7 @@ var PDFWorker = (function PDFWorkerClosure() {
     if (typeof PDFJSDev !== 'undefined' &&
         PDFJSDev.test('PRODUCTION && !(MOZCENTRAL || FIREFOX)') &&
         pdfjsFilePath) {
-      return pdfjsFilePath.replace(/\.js$/i, '.worker.js');
+      return pdfjsFilePath.replace(/(\.(?:min\.)?js)$/i, '.worker$1');
     }
     error('No PDFJS.workerSrc specified');
   }

Original file line number	Diff line number	Diff line change
`@@ -1097,7 +1097,7 @@ var PDFWorker = (function PDFWorkerClosure() {`
`1097`	`1097`	`if (typeof PDFJSDev !== 'undefined' &&`
`1098`	`1098`	`PDFJSDev.test('PRODUCTION && !(MOZCENTRAL \|\| FIREFOX)') &&`
`1099`	`1099`	`pdfjsFilePath) {`
`1100`		`- return pdfjsFilePath.replace(/\.js$/i, '.worker.js');`
	`1100`	`+ return pdfjsFilePath.replace(/(\.(?:min\.)?js)$/i, '.worker$1');`
`1101`	`1101`	`}`
`1102`	`1102`	`error('No PDFJS.workerSrc specified');`
`1103`	`1103`	`}`