summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-05-15 19:47:02 +0200
committerGitHub <noreply@github.com>2020-05-15 19:47:02 +0200
commit91a2d5e0124a59270c89830c52557a5d45c8faee (patch)
tree2741e9c2cef0d3bada0363839929e7f51799d790
parentd23c7fff2a68abc6a53a83bd4f2ca0427d5d41a8 (diff)
parentafeeb1eb1f35cd4e661ade0be7074d5c7369020b (diff)
downloadnextcloud-server-91a2d5e0124a59270c89830c52557a5d45c8faee.tar.gz
nextcloud-server-91a2d5e0124a59270c89830c52557a5d45c8faee.zip
Merge pull request #20629 from mejo-/files_sharing_preview_text
Don't load text file preview when text app is available (Fixes: #20615)
-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;
}