Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8058 from yurydelendik/fix-webpack-combined

Browse Source 
Fixes pdf.combined.js for webpack
This commit is contained in:
Yury Delendik 2017-02-10 13:40:53 -06:00 committed by GitHub
commit 1549a46e3d
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/display/api.js
View File

@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
/* globals requirejs, pdfjsLibs, __webpack_require__, __pdfjsdev_webpack__ */ /* globals requirejs, __pdfjsdev_webpack__ */
'use strict'; 'use strict';
@ -1121,7 +1121,9 @@ var PDFWorker = (function PDFWorkerClosure() {
throw new Error('AMD or CommonJS must be used to load fake worker.'); throw new Error('AMD or CommonJS must be used to load fake worker.');
} }
} else if (PDFJSDev.test('SINGLE_FILE')) { } else if (PDFJSDev.test('SINGLE_FILE')) {
WorkerMessageHandler = pdfjsLibs.pdfjsCoreWorker.WorkerMessageHandler; var pdfjsCoreWorker = require('../core/worker.js');
require('../core/network.js');
WorkerMessageHandler = pdfjsCoreWorker.WorkerMessageHandler;
fakeWorkerFilesLoadedCapability.resolve(WorkerMessageHandler); fakeWorkerFilesLoadedCapability.resolve(WorkerMessageHandler);
} else { } else {
var loader = fakeWorkerFilesLoader || function (callback) { var loader = fakeWorkerFilesLoader || function (callback) {

5
src/pdf.js
View File

@ -28,11 +28,6 @@ var pdfjsDisplayAnnotationLayer = require('./display/annotation_layer.js');
var pdfjsDisplayDOMUtils = require('./display/dom_utils.js'); var pdfjsDisplayDOMUtils = require('./display/dom_utils.js');
var pdfjsDisplaySVG = require('./display/svg.js'); var pdfjsDisplaySVG = require('./display/svg.js');
if (typeof PDFJSDev !== 'undefined' && PDFJSDev.test('SINGLE_FILE')) {
require('./core/worker.js');
require('./core/network.js');
}
exports.PDFJS = pdfjsDisplayGlobal.PDFJS; exports.PDFJS = pdfjsDisplayGlobal.PDFJS;
exports.build = pdfjsDisplayAPI.build; exports.build = pdfjsDisplayAPI.build;
exports.version = pdfjsDisplayAPI.version; exports.version = pdfjsDisplayAPI.version;