diff options
| author | Julius Haertl <jus@bitgrid.net> | 2016-08-11 23:27:26 +0200 |
|---|---|---|
| committer | Julius Haertl <jus@bitgrid.net> | 2016-11-18 10:23:22 +0100 |
| commit | e5f8f28d04df4ca046c80fa10275f0341d9ea25c (patch) | |
| tree | 35726f8327afca869626f50c35219723e600f950 /core | |
| parent | b3eab7db01f8e6dc4c98a1f89171052d8bf762b5 (diff) | |
| download | nextcloud-server-e5f8f28d04df4ca046c80fa10275f0341d9ea25c.tar.gz nextcloud-server-e5f8f28d04df4ca046c80fa10275f0341d9ea25c.zip | |
Core: Load mimetype icons from theming app if available
Signed-off-by: Julius Haertl <jus@bitgrid.net>
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/mimetype.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/js/mimetype.js b/core/js/mimetype.js index 0d30da26c26..b830e673151 100644 --- a/core/js/mimetype.js +++ b/core/js/mimetype.js @@ -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) { |