]> source.dussan.org Git - nextcloud-server.git/commitdiff
Core: Load mimetype icons from theming app if available
authorJulius Haertl <jus@bitgrid.net>
Thu, 11 Aug 2016 21:27:26 +0000 (23:27 +0200)
committerJulius Haertl <jus@bitgrid.net>
Fri, 18 Nov 2016 09:23:22 +0000 (10:23 +0100)
Signed-off-by: Julius Haertl <jus@bitgrid.net>
core/js/mimetype.js

index 0d30da26c26598663f76f533d64ea283dbd5e6e6..b830e6731519a598c3aa58aa221b2507ebb50a25 100644 (file)
@@ -91,6 +91,11 @@ OC.MimeType = {
                                path += icon;
                        }
                }
+               if(OCA.Theming) {
+                       path = OC.generateUrl('/apps/theming/image/core/filetypes/');
+                       path += OC.MimeType._getFile(mimeType, OC.MimeTypeList.files);
+                       gotIcon = true;
+               }
 
                // If we do not yet have an icon fall back to the default
                if (gotIcon === null) {