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

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2020-05-20 14:54:17 +0300
committerGitHub <noreply@github.com>2020-05-20 14:54:17 +0300
commit138eddc0f175148263fc8678dae1aa346fa3daeb (patch)
treef48d7cc6cb02c7d5a2c04020505bcbffd05cba95
parent703d8f2adc5d5e533bb5175b313f2fb533a1b63d (diff)
parentbe37ca1776f5a75e051ef61a1b4f1c1e8cc819cf (diff)
Merge pull request #21028 from nextcloud/backport/20629/stable19
[stable19] 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;
}