diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2017-11-01 14:49:52 +0100 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2017-11-01 14:49:52 +0100 |
| commit | 84b8cb12be60b2d513f31181792d4c0ff35a827d (patch) | |
| tree | d789e798d3828bdcb0a9c5b5f714ae5a2134478b /apps | |
| parent | 18dff925bec138afb0a717a5728caf4f63bbb593 (diff) | |
| download | nextcloud-server-84b8cb12be60b2d513f31181792d4c0ff35a827d.tar.gz nextcloud-server-84b8cb12be60b2d513f31181792d4c0ff35a827d.zip | |
Clicking publicly shared image opens direct preview url
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/js/public.js | 9 | ||||
| -rw-r--r-- | apps/files_sharing/templates/public.php | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 17dbdcd2696..2581f77c63f 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -116,7 +116,8 @@ OCA.Sharing.PublicApp = { scalingup: 0 }; - var img = $('<img class="publicpreview" alt="">'); + var imgcontainer = $('<a href="' + $('#previewURL').val() + '" target="_blank"><img class="publicpreview" alt=""></a>'); + var img = imgcontainer.find('.publicpreview'); img.css({ 'max-width': previewWidth, 'max-height': previewHeight @@ -128,7 +129,7 @@ OCA.Sharing.PublicApp = { if (mimetype === 'image/gif' && (maxGifSize === -1 || fileSize <= (maxGifSize * 1024 * 1024))) { img.attr('src', $('#downloadURL').val()); - img.appendTo('#imgframe'); + imgcontainer.appendTo('#imgframe'); } else if (mimetype.substr(0, mimetype.indexOf('/')) === 'text' && window.btoa) { // Undocumented Url to public WebDAV endpoint var url = parent.location.protocol + '//' + location.host + OC.linkTo('', 'public.php/webdav'); @@ -145,11 +146,11 @@ OCA.Sharing.PublicApp = { mimetype.substr(0, mimetype.indexOf('/')) === 'image' && mimetype !== 'image/svg+xml') { img.attr('src', OC.filePath('files_sharing', 'ajax', 'publicpreview.php') + '?' + OC.buildQueryString(params)); - img.appendTo('#imgframe'); + imgcontainer.appendTo('#imgframe'); } else if (mimetype.substr(0, mimetype.indexOf('/')) !== 'video') { img.attr('src', OC.Util.replaceSVGIcon(mimetypeIcon)); img.attr('width', 128); - img.appendTo('#imgframe'); + imgcontainer.appendTo('#imgframe'); } else if (previewSupported === 'true') { $('#imgframe > video').attr('poster', OC.filePath('files_sharing', 'ajax', 'publicpreview.php') + '?' + OC.buildQueryString(params)); diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index beeefe13cbd..5417809b908 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -16,6 +16,7 @@ <input type="hidden" id="isPublic" name="isPublic" value="1"> <input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir"> <input type="hidden" name="downloadURL" value="<?php p($_['downloadURL']) ?>" id="downloadURL"> +<input type="hidden" name="previewURL" value="<?php p($_['previewURL']) ?>" id="previewURL"> <input type="hidden" name="sharingToken" value="<?php p($_['sharingToken']) ?>" id="sharingToken"> <input type="hidden" name="filename" value="<?php p($_['filename']) ?>" id="filename"> <input type="hidden" name="mimetype" value="<?php p($_['mimetype']) ?>" id="mimetype"> |