diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-31 12:56:36 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-31 12:56:36 +0200 |
| commit | 5d653753bd8f6f1294dfbfa112757e5509ddc80d (patch) | |
| tree | 54853c3cf28f4d3ec58d7f9230be68e8e70d4998 /apps/files_sharing/js/public.js | |
| parent | 30526ded803e352f3f7322ed96ebc480d5e3f9c1 (diff) | |
| parent | 92e90c8eb995c886b3e9cd77c14e3f0b25b95cd7 (diff) | |
| download | nextcloud-server-5d653753bd8f6f1294dfbfa112757e5509ddc80d.tar.gz nextcloud-server-5d653753bd8f6f1294dfbfa112757e5509ddc80d.zip | |
Merge branch 'master' into oc_avatars
Diffstat (limited to 'apps/files_sharing/js/public.js')
| -rw-r--r-- | apps/files_sharing/js/public.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 7ffd5e06873..357c6fdf540 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -16,7 +16,7 @@ $(document).ready(function() { if (typeof FileActions !== 'undefined') { var mimetype = $('#mimetype').val(); // Show file preview if previewer is available, images are already handled by the template - if (mimetype.substr(0, mimetype.indexOf('/')) != 'image') { + if (mimetype.substr(0, mimetype.indexOf('/')) != 'image' && $('.publicpreview').length === 0) { // Trigger default action if not download TODO var action = FileActions.getDefault(mimetype, 'file', OC.PERMISSION_READ); if (typeof action === 'undefined') { |