mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #21769 from owncloud/sort-mimetype-list-before-saving 

Sort mimetype list before saving
This commit is contained in:
Roeland Douma 2016-01-18 13:30:27 +01:00
parent e4d5229940 50557b19b6
commit 57d9e2b2b7
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/command/maintenance/mimetype/updatejs.php
View File

@ -71,6 +71,7 @@ class UpdateJS extends Command {
//Remove duplicates //Remove duplicates
$files = array_values(array_unique($files)); $files = array_values(array_unique($files));
sort($files);
// Fetch all themes! // Fetch all themes!
$themes = []; $themes = [];
@ -100,6 +101,7 @@ class UpdateJS extends Command {
//Remove Duplicates //Remove Duplicates
$themes[$theme] = array_values(array_unique($themes[$theme])); $themes[$theme] = array_values(array_unique($themes[$theme]));
sort($themes[$theme]);
} }
//Generate the JS //Generate the JS

28
core/js/mimetypelist.js
View File

@ -82,26 +82,26 @@ OC.MimeTypeList={
"web": "text/code" "web": "text/code"
}, },
files: [ files: [
"video", "application",
"application-pdf",
"audio",
"file",
"folder",
"folder-drag-accept", "folder-drag-accept",
"folder-starred", "folder-external",
"folder-public", "folder-public",
"folder-shared",
"folder-starred",
"image",
"package-x-generic", "package-x-generic",
"text", "text",
"folder-external",
"text-vcard",
"application",
"text-code",
"x-office-spreadsheet",
"application-pdf",
"folder",
"x-office-document",
"text-calendar", "text-calendar",
"text-code",
"text-vcard",
"video",
"x-office-document",
"x-office-presentation", "x-office-presentation",
"file", "x-office-spreadsheet"
"folder-shared",
"image",
"audio"
], ],
themes: [] themes: []
}; };