Skip to content

Commit c9146e5

Browse files
danxuliudanxuliu
authored
Merge pull request #1397 from nextcloud/backport/1396/stable32
[stable32] Fix handling of "enableScripting" data attribute
2 parents ac4c618 + 1d45f57 commit c9146e5

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎js/files_pdfviewer-main.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/files_pdfviewer-main.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/views/PDFView.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ export default {
155155
PDFViewerApplicationOptions.set('sandboxBundleSrc', this.getViewerTemplateParameter('sandbox'))
156156
PDFViewerApplicationOptions.set('enablePermissions', true)
157157
PDFViewerApplicationOptions.set('imageResourcesPath', this.getViewerTemplateParameter('imageresourcespath'))
158-
PDFViewerApplicationOptions.set('enableScripting', this.getViewerTemplateParameter('enableScripting') === true)
158+
PDFViewerApplicationOptions.set('enableScripting', this.getViewerTemplateParameter('enablescripting') === 'true')
159159
160160
const language = getLanguage()
161161
const supportedLanguages = SUPPORTED_LANGUAGES

‎templates/viewer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
-->
4141
<html dir="ltr" mozdisallowselectionprint>
4242
<head data-workersrc="<?php p($urlGenerator->linkTo('files_pdfviewer', 'js/pdfjs/build/pdf.worker.mjs')) ?>?v=<?php p($version) ?>"
43-
data-enableScripting="<?php p($enableScripting ? true : false) ?>"
43+
data-enablescripting="<?php p($enableScripting ? 'true' : 'false') ?>"
4444
data-sandbox="<?php p($urlGenerator->linkTo('files_pdfviewer', 'js/pdfjs/build/pdf.sandbox.mjs'))?>"
4545
data-cmapurl="<?php p($urlGenerator->linkTo('files_pdfviewer', 'js/pdfjs/web/cmaps/')) ?>"
4646
data-imageresourcespath="<?php p($urlGenerator->linkTo('files_pdfviewer', 'js/pdfjs/web/images/')) ?>">

0 commit comments

Comments
 (0)