mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs 

fix thumbnail generation for subdirectories in the conflicts dialog
This commit is contained in:
Morris Jobke 2014-02-21 15:33:13 +01:00
parent aa0bcf7ba4 d9e333c0da
commit a5c70f16d2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/js/oc-dialogs.js
View File

@ -293,7 +293,7 @@ var OCdialogs = {
conflict.find('.replacement .size').text(humanFileSize(replacement.size)); conflict.find('.replacement .size').text(humanFileSize(replacement.size));
conflict.find('.replacement .mtime').text(formatDate(replacement.lastModifiedDate)); conflict.find('.replacement .mtime').text(formatDate(replacement.lastModifiedDate));
} }
var path = getPathForPreview(original.name); var path = original.directory + '/' +original.name;
Files.lazyLoadPreview(path, original.mime, function(previewpath){ Files.lazyLoadPreview(path, original.mime, function(previewpath){
conflict.find('.original .icon').css('background-image','url('+previewpath+')'); conflict.find('.original .icon').css('background-image','url('+previewpath+')');
}, 96, 96, original.etag); }, 96, 96, original.etag);