summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJonas Meurer <jonas@freesources.org>2020-04-23 13:45:10 +0200
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2020-05-18 08:59:53 +0000
commitbe37ca1776f5a75e051ef61a1b4f1c1e8cc819cf (patch)
treee145586bbf81049940091f6c36f5f0fff40619ea /apps
parent9d7198f31e75498f2df35c156cbcfdfc2f346ad2 (diff)
downloadnextcloud-server-be37ca1776f5a75e051ef61a1b4f1c1e8cc819cf.tar.gz
nextcloud-server-be37ca1776f5a75e051ef61a1b4f1c1e8cc819cf.zip
Don't load text file preview when text app is available (Fixes: #20615)
When opening a shared text document, the files_sharing app uses internal preview support in case no other app to open the text file is available. So far, it only checks for the old files_texteditor app, not for the new new text app. This commit fixes this by checking for both. Signed-off-by: Jonas Meurer <jonas@freesources.org>
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/js/public.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 982f32dbdd9..3986506bca8 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -152,7 +152,8 @@ OCA.Sharing.PublicApp = {
img.attr('src', $('#downloadURL').val());
imgcontainer.appendTo('#imgframe');
} else if (mimetype.substr(0, mimetype.indexOf('/')) === 'text' && window.btoa) {
- if (OC.appswebroots['files_texteditor'] !== undefined) {
+ if (OC.appswebroots['files_texteditor'] !== undefined ||
+ OC.appswebroots['text'] !== undefined) {
// the text editor handles the previewing
return;
}