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:
authorJonas Meurer <jonas@freesources.org>2020-04-23 14:45:10 +0300
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2020-05-15 20:48:57 +0300
commitd2396de9db3fb2802670b60379664a2fee695c86 (patch)
tree049b03786a88262e8ed0e20d21674bd551f8de1b
parent62950e9f9b7dab0b2d8fb886bd878cf2513d135c (diff)
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>
-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 042cc6c056e..d0f56287b52 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;
}