diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-08 12:13:24 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-10-08 12:13:24 +0200 |
| commit | 053b55721d69a54b8d9460868d9e6f3edc606271 (patch) | |
| tree | 873135b3a47e0ef03abcfdbbcf251b66f37863fc /core/js/oc-dialogs.js | |
| parent | c3286402a846bf874ae78a61880442f8ebfd7ba9 (diff) | |
| parent | 2123ef57d830abe24684b54f9819b75ab780834e (diff) | |
| download | nextcloud-server-053b55721d69a54b8d9460868d9e6f3edc606271.tar.gz nextcloud-server-053b55721d69a54b8d9460868d9e6f3edc606271.zip | |
Merge branch 'master' into fixing-appframework-master
Diffstat (limited to 'core/js/oc-dialogs.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( |