]> source.dussan.org Git - nextcloud-server.git/commitdiff
use correct property for mimetype of existing files
authorJörn Friedrich Dreyer <jfd@butonic.de>
Fri, 20 Sep 2013 12:29:45 +0000 (14:29 +0200)
committerMorris Jobke <morris.jobke@gmail.com>
Mon, 7 Oct 2013 09:14:11 +0000 (11:14 +0200)
core/js/oc-dialogs.js

index ac37b109e76a2ea17c6f7e101e5747f8aae1cbc3..e5e9f6dbb7d57e35965d88baa44d08a874351375 100644 (file)
@@ -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(