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

Merge pull request #7455 from Snuffleupagus/issue-7448

Browse Source 
Ensure that the necessary src/* dependencies are loaded before the viewer, when it's run with `gulp server` (issue 7448)
This commit is contained in:
Yury Delendik 2016-07-08 12:34:09 -05:00 committed by GitHub
commit b87676078c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/viewer.js
View File

@ -169,10 +169,15 @@ function webViewerLoad() {
var config = getViewerConfiguration(); var config = getViewerConfiguration();
//#if !PRODUCTION //#if !PRODUCTION
require.config({paths: {'pdfjs': '../src', 'pdfjs-web': '.'}}); require.config({paths: {'pdfjs': '../src', 'pdfjs-web': '.'}});
require(['pdfjs-web/pdfjs'], function () {
// Ensure that src/main_loader.js has loaded all the necessary dependencies
// *before* the viewer loads, to prevent issues in browsers relying on e.g.
// the Promise/URL polyfill in src/shared/util.js (fixes issue 7448).
require(['pdfjs-web/app', 'mozPrintCallback_polyfill.js'], function (web) { require(['pdfjs-web/app', 'mozPrintCallback_polyfill.js'], function (web) {
window.PDFViewerApplication = web.PDFViewerApplication; window.PDFViewerApplication = web.PDFViewerApplication;
web.PDFViewerApplication.run(config); web.PDFViewerApplication.run(config);
}); });
});
//#else //#else
//window.PDFViewerApplication = pdfjsWebLibs.pdfjsWebApp.PDFViewerApplication; //window.PDFViewerApplication = pdfjsWebLibs.pdfjsWebApp.PDFViewerApplication;
//pdfjsWebLibs.pdfjsWebApp.PDFViewerApplication.run(config); //pdfjsWebLibs.pdfjsWebApp.PDFViewerApplication.run(config);