summaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
Diffstat (limited to 'core/js')
-rw-r--r--core/js/js.js1
-rw-r--r--core/js/mimetypelist.js57
2 files changed, 24 insertions, 34 deletions
diff --git a/core/js/js.js b/core/js/js.js
index de773dc1221..b5971bfc579 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1972,4 +1972,5 @@ jQuery.fn.tipsy = function(argument) {
this.tooltip(argument);
jQuery.fn.tooltip.call(this, argument);
}
+ return this;
}
diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
index e49ace6df73..af2ad73c51b 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -9,26 +9,23 @@
OC.MimeTypeList={
aliases: {
"application/coreldraw": "image",
- "application/epub+zip": "text",
- "application/font-sfnt": "image",
- "application/font-woff": "image",
- "application/illustrator": "image",
- "application/javascript": "text/code",
+ "application/font-sfnt": "font",
+ "application/font-woff": "font",
+ "application/illustrator": "image/vector",
"application/json": "text/code",
- "application/msaccess": "file",
+ "application/msaccess": "database",
"application/msexcel": "x-office/spreadsheet",
"application/mspowerpoint": "x-office/presentation",
"application/msword": "x-office/document",
"application/octet-stream": "file",
- "application/postscript": "image",
- "application/rss+xml": "text/code",
+ "application/postscript": "image/vector",
"application/vnd.android.package-archive": "package/x-generic",
"application/vnd.ms-excel": "x-office/spreadsheet",
"application/vnd.ms-excel.addin.macroEnabled.12": "x-office/spreadsheet",
"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",
@@ -52,56 +49,48 @@ OC.MimeTypeList={
"application/vnd.openxmlformats-officedocument.wordprocessingml.document": "x-office/document",
"application/vnd.openxmlformats-officedocument.wordprocessingml.template": "x-office/document",
"application/x-7z-compressed": "package/x-generic",
- "application/x-cbr": "text",
"application/x-compressed": "package/x-generic",
"application/x-dcraw": "image",
"application/x-deb": "package/x-generic",
- "application/x-font": "image",
+ "application/x-font": "font",
"application/x-gimp": "image",
"application/x-gzip": "package/x-generic",
"application/x-perl": "text/code",
"application/x-photoshop": "image",
"application/x-php": "text/code",
"application/x-rar-compressed": "package/x-generic",
- "application/x-shockwave-flash": "application",
"application/x-tar": "package/x-generic",
"application/x-tex": "text",
"application/xml": "text/html",
"application/yaml": "text/code",
"application/zip": "package/x-generic",
- "database": "file",
"httpd/unix-directory": "dir",
- "image/svg+xml": "image",
- "image/vector": "image",
+ "image/svg+xml": "image/vector",
"text/css": "text/code",
"text/csv": "x-office/spreadsheet",
- "text/html": "text/code",
- "text/x-c": "text/code",
- "text/x-h": "text/code",
- "text/x-python": "text/code",
- "text/x-shellscript": "text/code",
- "web": "text/code"
+ "text/x-shellscript": "text/code"
},
files: [
- "video",
+ "application-pdf",
+ "application",
+ "audio",
+ "file",
"folder-drag-accept",
+ "folder-external",
"folder-public",
+ "folder-shared",
+ "folder-starred",
+ "folder",
+ "image",
"package-x-generic",
- "folder-external",
- "text-vcard",
- "application",
+ "text-calendar",
"text-code",
- "x-office-spreadsheet",
- "application-pdf",
- "folder",
+ "text-vcard",
+ "text",
+ "video",
"x-office-document",
- "text-calendar",
"x-office-presentation",
- "file",
- "text",
- "folder-shared",
- "image",
- "audio"
+ "x-office-spreadsheet"
],
themes: []
};