From 8d093e976acd818311e3be97b0d9afd6631632f2 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Fri, 14 Oct 2016 17:29:36 +0200
Subject: [PATCH] use mimetype icons in filepicker if there is no preview

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 core/js/oc-dialogs.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index bdee8a1bb09..edc0b3c797a 100644
--- 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));
-- 
GitLab