summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-05-22 16:33:29 +0200
committerGitHub <noreply@github.com>2018-05-22 16:33:29 +0200
commitb40bae816a5515b6420c0d82bf64eb187b2cd894 (patch)
tree056dd29152899cc5df09766b34c66211265f6a1a /apps
parent245d20f9ac8a5032bc11ff287f77d0e5a31bc3d5 (diff)
parent8c043dd00dec07c9b8c593a7408455bb81385535 (diff)
downloadnextcloud-server-b40bae816a5515b6420c0d82bf64eb187b2cd894.tar.gz
nextcloud-server-b40bae816a5515b6420c0d82bf64eb187b2cd894.zip
Merge pull request #9545 from nextcloud/bugfix/noid/ellipsis-below-public-textfiles
Remove ellipsis below public text file shares
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/js/public.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 33d8da09166..1de7c6b4fcd 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -132,6 +132,10 @@ 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) {
+ // the text editor handles the previewing
+ return;
+ }
// Undocumented Url to public WebDAV endpoint
var url = parent.location.protocol + '//' + location.host + OC.linkTo('', 'public.php/webdav');
$.ajax({