diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-11-05 01:21:51 -0800 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-11-05 01:21:51 -0800 |
commit | 3488202f6728261f6d140f62353ea405f2680452 (patch) | |
tree | d482789b497c1d8165a31debd5c90b6ab76a8aaf /apps/files/js/file-upload.js | |
parent | f91fe8d595d3ab00dcf2e6b68fba3a92616143f5 (diff) | |
parent | 35dd568f8fd627a45d3bb090ed7e955afadec9e3 (diff) | |
download | nextcloud-server-3488202f6728261f6d140f62353ea405f2680452.tar.gz nextcloud-server-3488202f6728261f6d140f62353ea405f2680452.zip |
Merge pull request #5582 from owncloud/files-previewcaching
Append file etag to preview URLs
Diffstat (limited to 'apps/files/js/file-upload.js')
-rw-r--r-- | apps/files/js/file-upload.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 8c56f1cb364..94290895ebd 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -575,11 +575,12 @@ $(document).ready(function() { tr.attr('data-size', result.data.size); tr.attr('data-mime', result.data.mime); tr.attr('data-id', result.data.id); + tr.attr('data-etag', result.data.etag); tr.find('.filesize').text(humanFileSize(result.data.size)); var path = getPathForPreview(name); - lazyLoadPreview(path, result.data.mime, function(previewpath) { + Files.lazyLoadPreview(path, result.data.mime, function(previewpath) { tr.find('td.filename').attr('style','background-image:url('+previewpath+')'); - }); + }, null, null, result.data.etag); FileActions.display(tr.find('td.filename'), true); } else { OC.dialogs.alert(result.data.message, t('core', 'Could not create file')); @@ -641,9 +642,9 @@ $(document).ready(function() { tr.data('mime', mime).data('id', id); tr.attr('data-id', id); var path = $('#dir').val()+'/'+localName; - lazyLoadPreview(path, mime, function(previewpath) { + Files.lazyLoadPreview(path, mime, function(previewpath) { tr.find('td.filename').attr('style', 'background-image:url('+previewpath+')'); - }); + }, null, null, data.etag); FileActions.display(tr.find('td.filename'), true); }); eventSource.listen('error',function(error) { |