diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-06-28 16:42:20 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-28 16:42:20 +0300 |
| commit | b47fe094687dd2eeaa511786b553d250ae0af936 (patch) | |
| tree | 44778e1b3f2c4ec17f667db70ce189e0b3d8a61d | |
| parent | ba1d25ea7e69d707066f37c2d570751ded2e6f2f (diff) | |
| parent | e3757382dbea11202dfedb2d02aa07683dfafc8a (diff) | |
Merge pull request #141 from nextcloud/backport/140/stable16v16.0.3v16.0.2RC1v16.0.2
[stable16] Fix load of character maps
| -rw-r--r-- | js/workersrc.js | 1 | ||||
| -rw-r--r-- | templates/viewer.php | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/js/workersrc.js b/js/workersrc.js index 6c7590f..20e64e9 100644 --- a/js/workersrc.js +++ b/js/workersrc.js @@ -31,6 +31,7 @@ function initializeCustomPDFViewerApplication() { PDFJS.openExternalLinksInNewWindow = true; PDFJS.isEvalSupported = false; PDFJS.workerSrc = document.getElementsByTagName('head')[0].getAttribute('data-workersrc'); + PDFJS.cMapUrl = document.getElementsByTagName('head')[0].getAttribute('data-cmapurl'); // The download has to be forced to use the URL of the file; by default // "PDFViewerApplication.download" uses a blob, but this causes a CSP error diff --git a/templates/viewer.php b/templates/viewer.php index 12b0cbe..7f06763 100644 --- a/templates/viewer.php +++ b/templates/viewer.php @@ -27,7 +27,8 @@ Adobe CMap resources are covered by their own copyright but the same license: See https://github.com/adobe-type-tools/cmap-resources --> <html dir="ltr" mozdisallowselectionprint moznomarginboxes> - <head data-workersrc="<?php p($urlGenerator->linkTo('files_pdfviewer', 'vendor/pdfjs/build/pdf.worker.js')) ?>?v=<?php p($version) ?>"> + <head data-workersrc="<?php p($urlGenerator->linkTo('files_pdfviewer', 'vendor/pdfjs/build/pdf.worker.js')) ?>?v=<?php p($version) ?>" + data-cmapurl="<?php p($urlGenerator->linkTo('files_pdfviewer', 'vendor/pdfjs/web/cmaps/')) ?>"> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <meta name="google" content="notranslate"> |