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 /core/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 'core/js')
| -rw-r--r-- | core/js/oc-dialogs.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index a9b40918ca7..f4e3ec01447 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -294,14 +294,14 @@ var OCdialogs = { conflict.find('.replacement .mtime').text(formatDate(replacement.lastModifiedDate)); } var path = getPathForPreview(original.name); - lazyLoadPreview(path, original.mime, function(previewpath){ + Files.lazyLoadPreview(path, original.mime, function(previewpath){ conflict.find('.original .icon').css('background-image','url('+previewpath+')'); - }, 96, 96); + }, 96, 96, original.etag); getCroppedPreview(replacement).then( function(path){ conflict.find('.replacement .icon').css('background-image','url(' + path + ')'); }, function(){ - getMimeIcon(replacement.type,function(path){ + Files.getMimeIcon(replacement.type,function(path){ conflict.find('.replacement .icon').css('background-image','url(' + path + ')'); }); } |