aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/js/mimetypelist.js9
-rw-r--r--resources/config/mimetypealiases.dist.json8
2 files changed, 9 insertions, 8 deletions
diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
index d861695c0ac..a2ca2c23d07 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -10,8 +10,8 @@ OC.MimeTypeList={
aliases: {
"application/coreldraw": "image",
"application/epub+zip": "text",
- "application/font-sfnt": "image",
- "application/font-woff": "image",
+ "application/font-sfnt": "font",
+ "application/font-woff": "font",
"application/gpx+xml": "location",
"application/illustrator": "image",
"application/javascript": "text/code",
@@ -34,7 +34,7 @@ OC.MimeTypeList={
"application/vnd.ms-excel.sheet.binary.macroEnabled.12": "x-office/spreadsheet",
"application/vnd.ms-excel.sheet.macroEnabled.12": "x-office/spreadsheet",
"application/vnd.ms-excel.template.macroEnabled.12": "x-office/spreadsheet",
- "application/vnd.ms-fontobject": "image",
+ "application/vnd.ms-fontobject": "font",
"application/vnd.ms-powerpoint": "x-office/presentation",
"application/vnd.ms-powerpoint.addin.macroEnabled.12": "x-office/presentation",
"application/vnd.ms-powerpoint.presentation.macroEnabled.12": "x-office/presentation",
@@ -78,7 +78,7 @@ OC.MimeTypeList={
"application/x-dcraw": "image",
"application/x-deb": "package/x-generic",
"application/x-fictionbook+xml": "text",
- "application/x-font": "image",
+ "application/x-font": "font",
"application/x-gimp": "image",
"application/x-gzip": "package/x-generic",
"application/x-iwork-keynote-sffkey": "x-office/presentation",
@@ -127,6 +127,7 @@ OC.MimeTypeList={
"folder-public",
"folder-shared",
"folder-starred",
+ "font",
"image",
"link",
"location",
diff --git a/resources/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json
index 68d39650ad9..67e79a52283 100644
--- a/resources/config/mimetypealiases.dist.json
+++ b/resources/config/mimetypealiases.dist.json
@@ -10,8 +10,8 @@
"application/coreldraw": "image",
"application/epub+zip": "text",
- "application/font-sfnt": "image",
- "application/font-woff": "image",
+ "application/font-sfnt": "font",
+ "application/font-woff": "font",
"application/gpx+xml": "location",
"application/gzip": "package/x-generic",
"application/illustrator": "image",
@@ -35,7 +35,7 @@
"application/vnd.ms-excel.sheet.binary.macroEnabled.12": "x-office/spreadsheet",
"application/vnd.ms-excel.sheet.macroEnabled.12": "x-office/spreadsheet",
"application/vnd.ms-excel.template.macroEnabled.12": "x-office/spreadsheet",
- "application/vnd.ms-fontobject": "image",
+ "application/vnd.ms-fontobject": "font",
"application/vnd.ms-powerpoint": "x-office/presentation",
"application/vnd.ms-powerpoint.addin.macroEnabled.12": "x-office/presentation",
"application/vnd.ms-powerpoint.presentation.macroEnabled.12": "x-office/presentation",
@@ -79,7 +79,7 @@
"application/x-dcraw": "image",
"application/x-deb": "package/x-generic",
"application/x-fictionbook+xml": "text",
- "application/x-font": "image",
+ "application/x-font": "font",
"application/x-gimp": "image",
"application/x-gzip": "application/gzip",
"application/x-iwork-keynote-sffkey": "x-office/presentation",