use mimetype icons in filepicker if there is no preview

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index bdee8a1bb09be74070ffb9a7991fc42e74a28f83..edc0b3c797a351b2451ecfea2dc08a15e7f719a5 100644 (file)
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -769,10 +769,17 @@ var OCdialogs = {
                                });
                                if (entry.type === 'file') {
                                        var urlSpec = {
-                                               file: dir + '/' + entry.name
+                                               file: dir + '/' + entry.name,
                                        };
+                                       $li.find('img').attr('src', OC.MimeType.getIconUrl(entry.mimetype));
+                                       var img = new Image();
                                        var previewUrl = OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
-                                       $li.find('img').attr('src', previewUrl);
+                                       img.onload = function() {
+                                               if (img.width > 5) {
+                                                       $li.find('img').attr('src', previewUrl);
+                                               }
+                                       };
+                                       img.src = previewUrl;
                                }
                                else {
                                        $li.find('img').attr('src', OC.Util.replaceSVGIcon(entry.icon));