Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/richdocuments.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2020-01-29 20:45:56 +0300
committerGitHub <noreply@github.com>2020-01-29 20:45:56 +0300
commitbec33de3198f5741e643b0ff2502a8c6ae800f8a (patch)
treeb4fea2a1a7403edb2a45cdb308f3e945e48fbef2 /src
parent12cc416415b70dba996e37c770877a0b618dbcb3 (diff)
parent427651d9a2c6f1527812c5628995e4ac08e739ed (diff)
Merge pull request #797 from nextcloud/bugfix/noid/pdf
Do not open optional formats on public pages by default
Diffstat (limited to 'src')
-rw-r--r--src/viewer.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/viewer.js b/src/viewer.js
index 906affe8..197b1b1a 100644
--- a/src/viewer.js
+++ b/src/viewer.js
@@ -39,7 +39,7 @@ const odfViewer = {
isCollaboraConfigured: typeof OC.getCapabilities().richdocuments.collabora === 'object' && OC.getCapabilities().richdocuments.collabora.length !== 0,
supportedMimes: OC.getCapabilities().richdocuments.mimetypes.concat(OC.getCapabilities().richdocuments.mimetypesNoDefaultOpen),
excludeMimeFromDefaultOpen: OC.getCapabilities().richdocuments.mimetypesNoDefaultOpen,
- hideDownloadMimes: ['image/jpeg', 'image/svg+xml', 'image/cgm', 'image/vnd.dxf', 'image/x-emf', 'image/x-wmf', 'image/x-wpg', 'image/x-freehand', 'image/bmp', 'image/png', 'image/gif', 'image/tiff', 'image/jpg', 'image/jpeg', 'text/plain'],
+ hideDownloadMimes: ['image/jpeg', 'image/svg+xml', 'image/cgm', 'image/vnd.dxf', 'image/x-emf', 'image/x-wmf', 'image/x-wpg', 'image/x-freehand', 'image/bmp', 'image/png', 'image/gif', 'image/tiff', 'image/jpg', 'image/jpeg', 'text/plain', 'application/pdf'],
register() {
const EDIT_ACTION_NAME = 'Edit with ' + OC.getCapabilities().richdocuments.productName
@@ -429,7 +429,7 @@ $(document).ready(function() {
}
// Open documents if a public page is opened for a supported mimetype
- const isSupportedMime = isPublic && odfViewer.supportedMimes.indexOf($('#mimetype').val()) !== -1
+ const isSupportedMime = isPublic && odfViewer.supportedMimes.indexOf($('#mimetype').val()) !== -1 && odfViewer.excludeMimeFromDefaultOpen.indexOf($('#mimetype').val()) === -1
const showSecureView = isPublic && isDownloadHidden && odfViewer.hideDownloadMimes.indexOf($('#mimetype').val()) !== -1
if (isSupportedMime || showSecureView) {
odfViewer.onEdit(document.getElementById('filename').value)