diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-05-18 12:30:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-18 12:30:13 +0200 |
commit | f6333369046873b4e887c4efb4d057c2d1c28668 (patch) | |
tree | 314acac440c5d611338c90852d96de562ca4c171 | |
parent | 883e5196085137270f4e4ccfb98f807fb34ae4f9 (diff) | |
parent | d2396de9db3fb2802670b60379664a2fee695c86 (diff) | |
download | nextcloud-server-f6333369046873b4e887c4efb4d057c2d1c28668.tar.gz nextcloud-server-f6333369046873b4e887c4efb4d057c2d1c28668.zip |
Merge pull request #20996 from nextcloud/backport/20629/stable18
[stable18] Don't load text file preview when text app is available (Fixes: #20615)
-rw-r--r-- | apps/files_sharing/js/public.js | 3 |
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; } |