wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #16118 from nextcloud/fix-placement-of-icon-in-public-share-page-for-audio-files

Browse source 
Fix placement of icon in public share page for audio files
This commit is contained in:
Roeland Jago Douma 2019-06-27 16:28:41 +02:00 committed by GitHub
commit f7ea09a0ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/files_sharing/css/public.scss
View file

@ -25,6 +25,12 @@
max-width: 100% !important;
}
#imgframe audio {
display: block;
margin-left: auto;
margin-right: auto;
}
#imgframe .text-preview {
display: inline-block;
position: relative;

13
apps/files_sharing/js/public.js
View file

@ -136,9 +136,11 @@ OCA.Sharing.PublicApp = {
scalingup: 0
};
var imgcontainer = $('<a href="' + $('#previewURL').val()
+ '" target="_blank"><img class="publicpreview" alt=""></a>');
var img = imgcontainer.find('.publicpreview');
var imgcontainer = $('<img class="publicpreview" alt="">');
if (hideDownload === 'false') {
imgcontainer = $('<a href="' + $('#previewURL').val() + '" target="_blank"></a>').append(imgcontainer);
}
var img = imgcontainer.hasClass('publicpreview')? imgcontainer: imgcontainer.find('.publicpreview');
img.css({
'max-width': previewWidth,
'max-height': previewHeight
@ -175,7 +177,10 @@ OCA.Sharing.PublicApp = {
} else if (mimetype.substr(0, mimetype.indexOf('/')) !== 'video') {
img.attr('src', mimetypeIcon);
img.attr('width', 128);
imgcontainer.appendTo('#imgframe');
// "#imgframe" is either empty or it contains an audio preview that
// the icon should appear before, so the container should be
// prepended to the frame.
imgcontainer.prependTo('#imgframe');
}
else if (previewSupported === 'true') {
$('#imgframe > video').attr('poster', OC.generateUrl('/apps/files_sharing/publicpreview/' + token + '?' + OC.buildQueryString(params)));