Skip to content

[stable20] Fix PDF viewer failing on Edge (not based on Chromium) #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 28, 2021
Merged

[stable20] Fix PDF viewer failing on Edge (not based on Chromium) #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24,566 changes: 18,309 additions & 6,257 deletions js/pdfjs/build/pdf.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/pdfjs/build/pdf.js.map
View file
Open in desktop

Large diffs are not rendered by default.

27,405 changes: 19,677 additions & 7,728 deletions js/pdfjs/build/pdf.worker.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/pdfjs/build/pdf.worker.js.map
View file
Open in desktop

Large diffs are not rendered by default.

16,260 changes: 9,617 additions & 6,643 deletions js/pdfjs/web/viewer.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/pdfjs/web/viewer.js.map
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion lib/Controller/DisplayController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ public function showPdfViewer(bool $minmode = false): TemplateResponse {
$policy->addAllowedChildSrcDomain('\'self\'');
$policy->addAllowedFontDomain('data:');
$policy->addAllowedImageDomain('*');
$policy->allowEvalScript(false);
// Needed for the ES5 compatible build of PDF.js
$policy->allowEvalScript(true);
$response->setContentSecurityPolicy($policy);

return $response;
Expand Down
2 changes: 1 addition & 1 deletion pdfjs-get.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ console.info('Fetching pdfjs', PDFJSversion)
const pdfjsProgress = new cliProgress.SingleBar({}, cliProgress.Presets.shades_classic)
pdfjsProgress.start(100, 0)

progress(request(`https://github.com/mozilla/pdf.js/releases/download/v${PDFJSversion}/pdfjs-${PDFJSversion}-dist.zip`), {
progress(request(`https://github.com/mozilla/pdf.js/releases/download/v${PDFJSversion}/pdfjs-${PDFJSversion}-es5-dist.zip`), {
throttle: 50,
delay: 0,
})
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/Controller/DisplayControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public function testShowPdfViewer(): void {
$policy->addAllowedChildSrcDomain('\'self\'');
$policy->addAllowedFontDomain('data:');
$policy->addAllowedImageDomain('*');
$policy->allowEvalScript(false);
$policy->allowEvalScript(true);
$expectedResponse->setContentSecurityPolicy($policy);

$this->assertEquals($expectedResponse, $this->controller->showPdfViewer());
Expand Down