diff options
| author | VicDeo <dubiniuk@owncloud.com> | 2013-10-07 08:19:40 -0700 |
|---|---|---|
| committer | VicDeo <dubiniuk@owncloud.com> | 2013-10-07 08:19:40 -0700 |
| commit | d8b7e42fc1626c64a28a31cfbde4a3789b9097bf (patch) | |
| tree | ff67b75013249405357f73d2f35d52302df3aa75 /core/js | |
| parent | b48dffa9a302881e8d1effe9d03bc97e96adc23b (diff) | |
| parent | 4ccbace68df0150cdadaa8e680a7cb2639e8c628 (diff) | |
| download | nextcloud-server-d8b7e42fc1626c64a28a31cfbde4a3789b9097bf.tar.gz nextcloud-server-d8b7e42fc1626c64a28a31cfbde4a3789b9097bf.zip | |
Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes
File conflicts dialog fixes
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/oc-dialogs.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index ac37b109e76..e5e9f6dbb7d 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -294,7 +294,7 @@ var OCdialogs = { conflict.find('.replacement .mtime').text(formatDate(replacement.lastModifiedDate)); } var path = getPathForPreview(original.name); - lazyLoadPreview(path, original.type, function(previewpath){ + lazyLoadPreview(path, original.mime, function(previewpath){ conflict.find('.original .icon').css('background-image','url('+previewpath+')'); }, 96, 96); getCroppedPreview(replacement).then( |