aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js/filelist.js
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2013-11-05 01:21:51 -0800
committerThomas Müller <thomas.mueller@tmit.eu>2013-11-05 01:21:51 -0800
commit3488202f6728261f6d140f62353ea405f2680452 (patch)
treed482789b497c1d8165a31debd5c90b6ab76a8aaf /apps/files/js/filelist.js
parentf91fe8d595d3ab00dcf2e6b68fba3a92616143f5 (diff)
parent35dd568f8fd627a45d3bb090ed7e955afadec9e3 (diff)
downloadnextcloud-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/filelist.js')
-rw-r--r--apps/files/js/filelist.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index e935ce7d5d3..3ef3c2c1766 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -329,9 +329,9 @@ var FileList={
tr.attr('data-id', id);
}
var path = getPathForPreview(name);
- lazyLoadPreview(path, mime, function(previewpath) {
+ Files.lazyLoadPreview(path, mime, function(previewpath) {
tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
- });
+ }, null, null, tr.attr('data-etag'));
tr.find('td.filename').draggable(dragOptions);
},
isLoading:function(name) {
@@ -867,7 +867,7 @@ $(document).ready(function() {
data.context = FileList.addFile(file.name, file.size, date, false, false, param);
// update file data
- data.context.attr('data-mime',file.mime).attr('data-id',file.id);
+ data.context.attr('data-mime',file.mime).attr('data-id',file.id).attr('data-etag', file.etag);
var permissions = data.context.data('permissions');
if (permissions !== file.permissions) {
@@ -877,9 +877,9 @@ $(document).ready(function() {
FileActions.display(data.context.find('td.filename'), true);
var path = getPathForPreview(file.name);
- lazyLoadPreview(path, file.mime, function(previewpath) {
+ Files.lazyLoadPreview(path, file.mime, function(previewpath) {
data.context.find('td.filename').attr('style','background-image:url('+previewpath+')');
- });
+ }, null, null, file.etag);
}
}
});